From 0e50a892fbc06680c701acda2d6c75e731584359 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Mon, 31 Jul 2023 18:21:10 +0800
Subject: [PATCH] * Fix bug #36954.

---
 module/task/model.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/module/task/model.php b/module/task/model.php
index 8af6776dff..08f7b7a0d1 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -170,6 +170,12 @@ class taskModel extends model
                 $requiredFields = str_replace(',estimate,', ',', $requiredFields);
             }
 
+            if(strpos($requiredFields, ',estStarted,') !== false and !isset($task->estStarted)) dao::$errors['estStarted'] = sprintf($this->lang->error->notempty, $this->lang->task->estStarted);
+            if(strpos($requiredFields, ',deadline,') !== false and !isset($task->deadline)) dao::$errors['deadline'] = sprintf($this->lang->error->notempty, $this->lang->task->deadline);
+            if(isset($task->estStarted) and isset($task->deadline) and !helper::isZeroDate($task->deadline) and $task->deadline <= $task->estStarted) dao::$errors['deadline'] = sprintf($this->lang->error->ge, $this->lang->task->deadline, $task->estStarted);
+
+            if(dao::isError()) return false;
+
             $requiredFields = trim($requiredFields, ',');
 
             /* Fix Bug #2466 */