From 293f93dd48cd91740042a5dfa7b377159999dfa9 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Mon, 1 Jul 2013 07:51:45 +0000
Subject: [PATCH]  * fix a bug : empty can't use the return of trim.

---
 module/common/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/common/model.php b/module/common/model.php
index cd6e4ee5ab..99be521802 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -653,7 +653,8 @@ class commonModel extends model
             $queryCondition = explode('ORDER', $sql);
             $queryCondition = $queryCondition[0];
         }
-        if(empty(trim($queryCondition))) $queryCondition = "1=1";
+        $queryCondition = trim($queryCondition);
+        if(empty($queryCondition)) $queryCondition = "1=1";
 
         $this->session->set($objectType . 'QueryCondition', $queryCondition);
         $this->session->set($objectType . 'OnlyCondition', $onlyCondition);