* Fix code error.
This commit is contained in:
@@ -354,7 +354,7 @@ class mailModel extends model
|
||||
if($this->config->mail->mta == 'smtp') $this->mta->smtpClose();
|
||||
|
||||
/* save errors. */
|
||||
if($this->isError()) $this->app->saveError('E_MAIL', join(' ', $this->errors), __FILE__, __LINE__, true);
|
||||
if($this->isError()) $this->app->saveError(2, join(' ', $this->errors), __FILE__, __LINE__, true);
|
||||
|
||||
$message = ob_get_contents();
|
||||
ob_end_clean();
|
||||
|
||||
@@ -1010,7 +1010,9 @@ class task extends control
|
||||
|
||||
$oldTask = $this->task->getById($taskID);
|
||||
$task = $this->taskZen->buildTaskForCancel($oldTask);
|
||||
$this->task->cancel($task, $output['laneID']);
|
||||
$laneID = isset($output['laneID']) ? $output['laneID'] : '';
|
||||
$this->task->cancel($task, (string)$laneID);
|
||||
|
||||
if(dao::isError()) return print($this->send(array('result' => 'fail', 'message' => dao::getError())));
|
||||
|
||||
$this->executeHooks($taskID);
|
||||
|
||||
@@ -550,6 +550,7 @@ class taskZen extends task
|
||||
->setDefault('canceledBy, lastEditedBy', $this->app->user->account)
|
||||
->setDefault('canceledDate, lastEditedDate', $now)
|
||||
->setIF(empty($oldTask->finishedDate), 'finishedDate', '')
|
||||
->remove('comment')
|
||||
->get();
|
||||
|
||||
return $this->loadModel('file')->processImgURL($task, $this->config->task->editor->cancel['id'], $this->post->uid);
|
||||
|
||||
Reference in New Issue
Block a user