diff --git a/module/bug/model.php b/module/bug/model.php index 4ed0cef685..96c3a4e48d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1896,7 +1896,7 @@ class bugModel extends model if(strpos($bugQuery, $allProduct) !== false) { $products = array_keys($this->loadModel('product')->getPrivProducts()); - $bugQuery = str_replace($allProduct, '1', $this->session->bugQuery); + $bugQuery = str_replace($allProduct, '1', $bugQuery); $bugQuery = $bugQuery . ' AND `product` ' . helper::dbIN($products); } if($branch) $bugQuery .= " AND `branch` in('0','$branch')"; diff --git a/module/project/model.php b/module/project/model.php index 020e517bf7..448b36d86f 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -821,7 +821,7 @@ class projectModel extends model /* Limit current project when no project. */ if(strpos($taskQuery, "`project` =") === false) $taskQuery = $taskQuery . " AND `project` = $projectID"; $projectQuery = "`project` " . helper::dbIN(array_keys($projects)); - $taskQuery = str_replace("`project` = 'all'", $projectQuery, $this->session->taskQuery); // Search all project. + $taskQuery = str_replace("`project` = 'all'", $projectQuery, $taskQuery); // Search all project. $this->session->set('taskQueryCondition', $taskQuery); $this->session->set('taskOnlyCondition', true); $this->session->set('taskOrderBy', $sort); diff --git a/module/story/model.php b/module/story/model.php index 6e0e01d652..9c7c9ef87f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1427,9 +1427,9 @@ class storyModel extends model $allProduct = "`product` = 'all'"; $storyQuery = $this->session->storyQuery; $queryProductID = $productID; - if(strpos($this->session->storyQuery, $allProduct) !== false) + if(strpos($storyQuery, $allProduct) !== false) { - $storyQuery = str_replace($allProduct, '1', $this->session->storyQuery); + $storyQuery = str_replace($allProduct, '1', $storyQuery); $queryProductID = 'all'; } $storyQuery = $storyQuery . ' AND `product` ' . helper::dbIN(array_keys($products));