- Fixed bug #5384: tablesort outputs invalid HTML (improved patch).

includes/tablesort.inc

@@ -41,6 +41,10 @@ function tablesort($cell, $header) {
   }
 
   $cell['data'] = l($cell['data'] . $image, $_GET['q'], array("title" => $title), "sort=". $ts['sort']. "&order=". urlencode($cell['data']). $ts['query_string']);
+
+  unset($cell['field']);
+  unset($cell['sort']);
+    
   return $cell;
 }
 

includes/theme.inc

@@ -502,7 +502,7 @@ function _theme_table_cell($cell, $header = 0) {
   if (is_array($cell)) {
     $data = $cell["data"];
     foreach ($cell as $key => $value) {
-      if ($key != "data" && $key != "field")  {
+      if ($key != "data")  {
         $attributes .= " $key=\"$value\"";
       }
     }