From 09f22aa42ee1dd21975e97779afb40af90ef6e72 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 12 Jan 2018 19:40:09 +0900
Subject: [PATCH] Fix #962 hide deleted comment from integration search

---
 modules/comment/comment.model.php                           | 1 +
 modules/comment/queries/getTotalCommentList.xml             | 1 +
 modules/comment/queries/getTotalCommentListWithinMember.xml | 2 ++
 modules/integration_search/integration_search.model.php     | 1 +
 4 files changed, 5 insertions(+)

diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 7d27d1527..2db5e9084 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -700,6 +700,7 @@ class commentModel extends comment
 		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		$args->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
+		$args->statusList = $obj->statusList;
 		if ($obj->is_secret)
 		{
 			$args->s_is_secret = $obj->is_secret;
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index 22a684467..8c26a8319 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -10,6 +10,7 @@
         <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
         <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
         <condition operation="equal" column="status" var="s_is_published" pipe="and" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="content" var="s_content" pipe="or" />
             <condition operation="equal" column="user_name" var="s_user_name" pipe="or" />
diff --git a/modules/comment/queries/getTotalCommentListWithinMember.xml b/modules/comment/queries/getTotalCommentListWithinMember.xml
index 90ebfa346..042547c89 100644
--- a/modules/comment/queries/getTotalCommentListWithinMember.xml
+++ b/modules/comment/queries/getTotalCommentListWithinMember.xml
@@ -10,6 +10,8 @@
         <condition operation="equal" column="member.user_id" var="s_user_id" notnull="notnull" />
         <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
+		<condition operation="equal" column="comments.status" var="s_is_published" pipe="and" />
+		<condition operation="in" column="comments.status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="comments.content" var="s_content" />
             <condition operation="equal" column="comments.user_name" var="s_user_name" pipe="or" />
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
index 7a2058e65..678839506 100644
--- a/modules/integration_search/integration_search.model.php
+++ b/modules/integration_search/integration_search.model.php
@@ -104,6 +104,7 @@ class integration_searchModel extends module
 		$args->is_secret = 'N';
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
+		$args->statusList = array(1);
 		// Get a list of documents
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getTotalCommentList($args);