diff --git a/module/bug/model.php b/module/bug/model.php index 803fba1cf8..1ea50fc5a5 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1868,7 +1868,7 @@ class bugModel extends model ->orderBy($orderBy)->page($pager)->fetchAll(); } - $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug'); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false); return $bugs; } @@ -1936,7 +1936,7 @@ class bugModel extends model ->fetchAll('id'); } - $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug'); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false); return $bugs; } diff --git a/module/common/model.php b/module/common/model.php index f31e9d5f8e..d86b3d4831 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2232,7 +2232,6 @@ EOD; $queryCondition = explode(' ORDER BY ', $sql); $queryCondition = $queryCondition[0]; } - $queryCondition = preg_replace('/((AND)|(OR)) *t2.\w+ * [^ ]+ [^ ]+/', '', $queryCondition); $queryCondition = trim($queryCondition); if(empty($queryCondition)) $queryCondition = "1=1";