From f81f7f565db5fc4402cc61db5034ca7c0769ccb2 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 15 Aug 2022 17:44:48 +0900
Subject: [PATCH] =?UTF-8?q?#1973=20=EB=B3=B4=EC=99=84=20-=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/comment/comment.admin.controller.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index b0f410271..e02971f20 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -190,6 +190,7 @@ class commentAdminController extends comment
 		}
 
 		$oCommentController = getController('comment');
+
 		// begin transaction
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -213,6 +214,8 @@ class commentAdminController extends comment
 		}
 
 		$deleted_count = 0;
+		$module_infos = [];
+		
 		// Delete the comment posting
 		for($i = 0; $i < $comment_count; $i++)
 		{
@@ -223,9 +226,18 @@ class commentAdminController extends comment
 			}
 
 			$comment = CommentModel::getComment($comment_srl);
-			$module_info = ModuleModel::getModuleInfoByModuleSrl($comment->get('module_srl'));
+			if(!$comment->isExists())
+			{
+				continue;
+			}
 			
-			if($module_info->comment_delete_message === 'yes')
+			$module_srl = $comment->get('module_srl');
+			if (!isset($module_infos[$module_srl]))
+			{
+				$module_infos[$module_srl] = ModuleModel::getModuleInfoByModuleSrl($module_srl)->comment_delete_message ?? '';
+			}
+			
+			if($module_infos[$module_srl] === 'yes')
 			{
 				$output = $oCommentController->updateCommentByDelete($comment, true);
 				if(!$output->toBool() && $output->error !== -2)
@@ -234,10 +246,9 @@ class commentAdminController extends comment
 					return $output;
 				}
 			}
-			elseif(starts_with('only_comm', $module_info->comment_delete_message))
+			elseif(starts_with('only_comm', $module_infos[$module_srl]))
 			{
 				$childs = CommentModel::getChildComments($comment_srl);
-				
 				if(count($childs) > 0)
 				{
 					$output = $oCommentController->updateCommentByDelete($comment, true);