Index: views_query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/Attic/views_query.inc,v
retrieving revision 1.51.2.12
diff -u -r1.51.2.12 views_query.inc
--- views_query.inc	10 Jan 2008 20:15:40 -0000	1.51.2.12
+++ views_query.inc	16 May 2008 00:05:33 -0000
@@ -635,7 +635,9 @@
       if ($this->header) {
         $result = tablesort_sql($this->header);
         if ($result) {
-          $this->orderby[] = str_replace('ORDER BY ', '', $result);
+          // Put table sort args at the beginning so views sort options are only defaults.
+          // and table sort will take priority once a user chooses a sort.
+          array_unshift($this->orderby, str_replace('ORDER BY ', '', $result));
         }
       }