Merge branch 'master' of github.com:easysoft/zentaopms

2016-02-19 11:06:16 +08:00
parent 33d94add3b 46136fbf70
commit aa6f3bc46d
1 changed files with 2 additions and 2 deletions
--- a/lib/dao/dao.class.php
+++ b/lib/dao/dao.class.php
@@ -551,8 +551,8 @@ class dao

            /* Remove the part after order and limit. */
            $subLength = strlen($sql);
-            $orderPOS  = strrpos($sql, 'order ');
-            $limitPOS  = strrpos($sql , 'limit');
+            $orderPOS  = strripos($sql, 'order by');
+            $limitPOS  = strripos($sql, 'limit');
            if($limitPOS) $subLength = $limitPOS;
            if($orderPOS) $subLength = $orderPOS;
            $sql = substr($sql, 0, $subLength);