diff --git a/module/file/view/viewfiles.html.php b/module/file/view/viewfiles.html.php index ec33f34857..be26583062 100644 --- a/module/file/view/viewfiles.html.php +++ b/module/file/view/viewfiles.html.php @@ -62,7 +62,7 @@ function deleteFile(fileID, obj) * @param int $extension * @param int $imageWidth * @param string $fileTitle - * @param string $type download,preview + * @param string $type download|preview * @access public * @return void */ diff --git a/module/task/model.php b/module/task/model.php index eeb75f3255..9c989ae392 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -4242,9 +4242,9 @@ class taskModel extends model { if($task->deleted) return ''; - $isPlmMode = $this->config->systemMode == 'PLM'; + $isPLMMode = $this->config->systemMode == 'PLM'; - if($isPlmMode) + if($isPLMMode) { $execution = $this->loadModel('execution')->getByID($task->execution); $execution = $this->loadModel('execution')->canStageStart($execution); @@ -4259,7 +4259,7 @@ class taskModel extends model $menu .= $this->buildMenu('task', 'assignTo', "executionID=$task->execution&taskID=$task->id", $task, 'button', '', '', 'iframe', true, '', $this->lang->task->assignTo); - $plmCanStart = !($isPlmMode and empty($execution['canStart'])); + $plmCanStart = !($isPLMMode and empty($execution['canStart'])); if($plmCanStart) $menu .= $this->buildMenu('task', 'start', $params, $task, 'view', '', '', 'iframe showinonlybody', true); if($plmCanStart) $menu .= $this->buildMenu('task', 'restart', $params, $task, 'view', '', '', 'iframe showinonlybody', true); if($plmCanStart) $menu .= $this->buildMenu('task', 'recordEstimate', $params, $task, 'view', '', '', 'iframe showinonlybody', true);