--- includes/tablesort.inc.old	2008-08-14 12:42:49.000000000 -0500
+++ includes/tablesort.inc	2008-08-14 12:43:57.000000000 -0500
@@ -152,22 +152,18 @@ function tablesort_get_order($headers) {
     }
 
     if (isset($header['sort']) && ($header['sort'] == 'asc' || $header['sort'] == 'desc')) {
-      $default = array('name' => $header['data'], 'sql' => isset($header['field']) ? $header['field'] : '');
+      return array('name' => $header['data'], 'sql' => isset($header['field']) ? $header['field'] : '');
     }
   }
 
-  if (isset($default)) {
-    return $default;
-  }
-  else {
-    // The first column specified is initial 'order by' field unless otherwise specified
-    if (is_array($headers[0])) {
-      return array('name' => $headers[0]['data'], 'sql' => $headers[0]['field']);
-    }
-    else {
-      return array('name' => $headers[0]);
-    }
-  }
+   // The first column specified is initial 'order by' field unless otherwise specified
+   if (is_array($headers[0])) {
+     return array('name' => $headers[0]['data'], 'sql' => $headers[0]['field']);
+   }
+   else {
+     return array('name' => $headers[0]);
+   }
+
 }
 
 /**