diff --git a/module/bug/model.php b/module/bug/model.php index d0fd2af4a1..93d03a8260 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -886,13 +886,13 @@ class bugModel extends model if($this->session->$queryName === false) $this->session->set($queryName, ' 1 = 1'); } + if($moduleName == 'contributeBug') $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, null, $orderBy, 'bug'); + $query = $this->session->$queryName; if(strpos($query, "`project` = 'all'") !== false) $query = str_replace("`project` = 'all'", '1 = 1', $query); $query = preg_replace('/`(\w+)`/', 't1.`$1`', $query); $orderBy = str_replace('id_', 't1.id_', $orderBy); - if($moduleName == 'contributeBug') $bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, null, $orderBy, 'bug'); - return $this->dao->select("t1.*, IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) AS priOrder, IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) AS severityOrder,t2.name AS productName, t2.shadow") ->from(TABLE_BUG)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id') diff --git a/module/my/zen.php b/module/my/zen.php index 22e4b04e0d..1af02344b4 100644 --- a/module/my/zen.php +++ b/module/my/zen.php @@ -294,4 +294,3 @@ class myZen extends my return $count; } } -