diff --git a/module/common/model.php b/module/common/model.php index ca2401a3bd..4ad05649c9 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2117,8 +2117,8 @@ EOD; $select = ''; if($this->session->$typeOnlyCondition) { - if(strpos($orderBy, 'priOrder_') !== false) $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder"; - if(strpos($orderBy, 'severityOrder_') !== false) $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder"; + if(strpos($orderBy, 'priOrder') !== false) $select .= ", IF(`pri` = 0, {$this->config->maxPriValue}, `pri`) as priOrder"; + if(strpos($orderBy, 'severityOrder') !== false) $select .= ", IF(`severity` = 0, {$this->config->maxPriValue}, `severity`) as severityOrder"; $sql = $this->dao->select("*$select")->from($table) ->where($queryCondition) ->beginIF($orderBy != false)->orderBy($orderBy)->fi() diff --git a/module/story/view/batchclose.html.php b/module/story/view/batchclose.html.php index 11ba36be4c..0c27cb184f 100755 --- a/module/story/view/batchclose.html.php +++ b/module/story/view/batchclose.html.php @@ -15,7 +15,7 @@ tab);?>