From bedbbd4b7fa4b297fe67c6ccf1bf2412f8fb7e7d Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 24 May 2023 13:19:12 +0800
Subject: [PATCH] * Fix code error.

---
 module/mail/model.php   | 2 +-
 module/task/control.php | 4 +++-
 module/task/zen.php     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/mail/model.php b/module/mail/model.php
index d402cedc5b..5bb2cdb0ba 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -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();
diff --git a/module/task/control.php b/module/task/control.php
index 127b317925..d192b0f8fd 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -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);
diff --git a/module/task/zen.php b/module/task/zen.php
index 5aeaf36233..31e82ba366 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -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);