From cc2c00797fd1aab26bf4e5bc22869ec3ab91ad8d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 15 Nov 2019 11:07:00 +0800
Subject: [PATCH] * Finish task #6491.

---
 module/bug/model.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 9792a79744..feb29caf4b 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -912,10 +912,16 @@ class bugModel extends model
      */
     public function resolve($bugID)
     {
-        if(strpos($this->config->bug->resolve->requiredFields, 'comment') !== false and !$this->post->comment)
+        /* Check required fields before create build. */
+        $requiredFields = explode(',', trim($this->config->bug->resolve->requiredFields, ','));
+        foreach($requiredFields as $requiredField)
         {
-            dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->comment);
-            return false;
+            if(!$this->post->$requiredField)
+            {
+                $tip = $requiredField == 'comment' ? $this->lang->comment : $this->lang->bug->$requiredField;
+                dao::$errors[] = sprintf($this->lang->error->notempty, $tip);
+                return false;
+            } 
         }
 
         $now    = helper::now();