* adjust code and fix bugs.

2013-08-06 16:11:11 +08:00
parent 0fdf9dd1ec
commit 500858eb5e
4 changed files with 22 additions and 11 deletions
@@ -163,18 +163,20 @@ class common extends control
        if(empty($method)) $method = $app->getMethodName();
        $className = 'header';

-        if(strpos($orderBy, $fieldName) !== false)
+        $order = explode('_', $orderBy);
+        $order[0] = trim($order[0], '`');
+        if($order[0] == $fieldName)
        {
-            if(stripos($orderBy, 'desc') !== false)
+            if(isset($order[1]) and $order[1] == 'asc')
            {
-                $orderBy   = str_ireplace('desc', 'asc', $orderBy);
-                $className = 'headerSortUp';
-            }
-            elseif(stripos($orderBy, 'asc')  !== false)
-            {
-                $orderBy = str_ireplace('asc', 'desc', $orderBy);
+                $orderBy   = "`{$order[0]}`_desc";
                $className = 'headerSortDown';
            }
+            else
+            {
+                $orderBy = "`{$order[0]}`_asc";
+                $className = 'headerSortUp';
+            }
        }
        else
        {