diff options
Diffstat (limited to 'includes/theme.inc')
| -rw-r--r-- | includes/theme.inc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index e77a79ce9..5101fa516 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -318,6 +318,7 @@ function theme_table($header, $rows, $attributes = NULL) { */ if (is_array($header)) { + $ts = tablesort_init($header); $output .= " <tr>"; foreach ($header as $cell) { if (is_array($cell) && $cell['field']) { @@ -343,16 +344,12 @@ function theme_table($header, $rows, $attributes = NULL) { } foreach ($row as $cell) { - // highlight the currently sorted column. only applies to tables with headers. - if (is_array($header)) { - $ts = tablesort_init($header); - if ($i === $ts['index']) { - if (is_array($cell)) { - $cell['class'] = 'active'; - } - else { - $cell = array('data' => $cell, 'class' => 'active'); - } + if ($header[$i]['data'] == $ts['name'] && $header[$i]['field']) { + if (is_array($cell)) { + $cell['class'] .= ' active'; + } + else { + $cell = array('data' => $cell, 'class' => 'active'); } } $output .= _theme_table_cell($cell, 0); @@ -364,7 +361,6 @@ function theme_table($header, $rows, $attributes = NULL) { } $output .= "</table>\n"; - return $output; } |