diff --git a/module/story/model.php b/module/story/model.php index bfffac3d93..9539d9b3be 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4544,6 +4544,7 @@ class storyModel extends model */ public function updateStoryByReview($storyID, $oldStory, $story) { + $now = helper::now(); $reviewerList = $this->getReviewerPairs($storyID, $oldStory->version); $reviewedBy = explode(',', trim($story->reviewedBy, ',')); if(!array_diff(array_keys($reviewerList), $reviewedBy)) diff --git a/module/task/model.php b/module/task/model.php index fd8ec01ac8..6b7616902c 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2495,7 +2495,7 @@ class taskModel extends model /* Delayed or not?. */ if($task->status !== 'done' and $task->status !== 'cancel' and $task->status != 'closed') { - if(!empty($taks->deadline) and !helper::isZeroDate($task->deadline)) + if(!empty($task->deadline) and !helper::isZeroDate($task->deadline)) { $delay = helper::diffDate($today, $task->deadline); if($delay > 0) $task->delay = $delay; diff --git a/module/tree/model.php b/module/tree/model.php index b6d279f19a..9c784faafc 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -859,7 +859,7 @@ class treeModel extends model if(is_array($extra)) { $table = $this->config->objectTables[$type]; - $objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq((int)$extra['branch'])->fetchAll('module'); + $objects = $this->dao->select('module')->from($table)->where('product')->eq((int)$extra['rootID'])->andWhere('branch')->eq($extra['branch'])->fetchAll('module'); } else {