From b5fc7b9ab2c6cb039b6b56eb20460819fe50bf21 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 17 May 2020 21:14:59 +0900
Subject: [PATCH] Fix #1285 #1286 prevent change of status of deleted comments

---
 modules/comment/comment.admin.controller.php      | 15 ++++++++++++---
 modules/comment/queries/updatePublishedStatus.xml |  7 +++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index 1a78ced5a..bcf17286e 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -69,6 +69,14 @@ class commentAdminController extends comment
 
 		$args = new stdClass();
 		$args->status = $will_publish;
+		if ($will_publish)
+		{
+			$args->old_status = array(0, 1, 2, 3, 4, 5, 6);
+		}
+		else
+		{
+			$args->old_status = array(0, 1);
+		}
 		$args->comment_srls_list = $comment_srl_list;
 		$output = executeQuery('comment.updatePublishedStatus', $args);
 		if(!$output->toBool())
@@ -89,15 +97,16 @@ class commentAdminController extends comment
 			$logged_info = Context::get('logged_info');
 			//$oMemberModule = getModel("member");
 			//$logged_info = $oMemberModule->getMemberInfoByMemberSrl($logged_member_srl);
-			$new_status = ($will_publish) ? "published" : "unpublished";
+			$new_status = lang('comment.published_name_list')[$will_publish];
 			foreach($comment_srl_list as $comment_srl)
 			{
 				// check if comment already exists
 				$comment = $oCommentModel->getComment($comment_srl);
-				if($comment->comment_srl != $comment_srl)
+				if($comment->comment_srl != $comment_srl || $comment->status != $will_publish)
 				{
-					throw new Rhymix\Framework\Exceptions\InvalidRequest;
+					continue;
 				}
+
 				$document_srl = $comment->document_srl;
 				if(!in_array($document_srl, $updated_documents_arr))
 				{
diff --git a/modules/comment/queries/updatePublishedStatus.xml b/modules/comment/queries/updatePublishedStatus.xml
index e1602d469..2984e770a 100644
--- a/modules/comment/queries/updatePublishedStatus.xml
+++ b/modules/comment/queries/updatePublishedStatus.xml
@@ -6,7 +6,10 @@
         <column name="status" var="status" notnull="notnull" />
     </columns>
     <conditions>
-        <condition operation="in" column="comment_srl" var="comment_srls_list" notnull="notnull" pipe="or" />
-        <condition operation="in" column="parent_srl" var="comment_srls_list" notnull="notnull" pipe="or" />
+        <condition operation="in" column="status" var="old_status" />
+        <group pipe="and">
+            <condition operation="in" column="comment_srl" var="comment_srls_list" notnull="notnull" />
+            <condition operation="in" column="parent_srl" var="comment_srls_list" notnull="notnull" pipe="or" />
+        </group>
     </conditions>
 </query>