diff --git a/module/product/control.php b/module/product/control.php index 0ac55abb9c..14eaf3b42c 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -771,7 +771,7 @@ class product extends control $this->view->users = $this->user->getPairs('noletter'); $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->branches = $this->loadModel('branch')->getPairs($productID); - $this->view->reviewers = $product->reviewer ? explode(',', $product->reviewer) : array(); + $this->view->reviewers = explode(',', $product->reviewer); $this->display(); } diff --git a/module/task/model.php b/module/task/model.php index 264dd65b20..75fb9d6741 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2409,12 +2409,12 @@ class taskModel extends model ->andWhere('t1.vision')->eq($this->config->vision) ->fetch(); if(!$task) return false; - if($task->openedDate) $task->openedDate = substr($task->openedDate, 0, 19); - if($task->finishedDate) $task->finishedDate = substr($task->finishedDate, 0, 19); - if($task->canceledDate) $task->canceledDate = substr($task->canceledDate, 0, 19); - if($task->closedDate) $task->closedDate = substr($task->closedDate, 0, 19); - if($task->lastEditedDate) $task->lastEditedDate = substr($task->lastEditedDate, 0, 19); - if($task->realStarted) $task->realStarted = substr($task->realStarted, 0, 19); + $task->openedDate = substr($task->openedDate, 0, 19); + $task->finishedDate = substr($task->finishedDate, 0, 19); + $task->canceledDate = substr($task->canceledDate, 0, 19); + $task->closedDate = substr($task->closedDate, 0, 19); + $task->lastEditedDate = substr($task->lastEditedDate, 0, 19); + $task->realStarted = substr($task->realStarted, 0, 19); $children = $this->dao->select('*')->from(TABLE_TASK)->where('parent')->eq($taskID)->andWhere('deleted')->eq(0)->fetchAll('id'); $task->children = $children; @@ -4695,7 +4695,7 @@ class taskModel extends model } } - $mailto = $task->mailto ? explode(',', $task->mailto) : array(); + $mailto = explode(',', $task->mailto); foreach($mailto as $key => $account) { $account = trim($account); diff --git a/module/user/model.php b/module/user/model.php index 08e944d916..a59c30fd2f 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -2712,10 +2712,7 @@ class userModel extends model $users = array(); foreach(explode(',', trim($this->app->company->admins, ',')) as $admin) $users[$admin] = $admin; - if(!empty($product->reviewer)) - { - foreach(explode(',', trim($product->reviewer, ',')) as $account) $users[$account] = $account; - } + foreach(explode(',', trim($product->reviewer, ',')) as $account) $users[$account] = $account; if(isset($product->PMT)) { foreach(explode(',', trim($product->PMT, ',')) as $account) $users[$account] = $account;