From a7af0f9eb81ca7a7ec84944ae59762f2f8511ac6 Mon Sep 17 00:00:00 2001
From: BJRambo <qw5414@naver.com>
Date: Fri, 9 Aug 2019 18:48:16 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EA=B3=A0=20=EC=B7=A8=EC=86=8C?=
 =?UTF-8?q?=EC=A0=84=20=EB=AC=B8=EC=84=9C=20=EC=A1=B4=EC=9E=AC=20=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80=20=EA=B2=80=EC=82=AC=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=98=EA=B3=A0=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=98?=
 =?UTF-8?q?=EA=B2=8C=20=EC=A0=95=EC=88=98=EB=A1=9C=20=EB=A7=8C=EB=93=A4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=ED=95=A8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

그리고 신고를 취소할 때 트리거에 신고 카운트변수가 선언되지 않는 문제 고침
---
 modules/document/document.controller.php | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index e5e65ba77..e7134903a 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -314,13 +314,15 @@ class documentController extends document
 		
 		$document_srl = intval(Context::get('target_srl'));
 		
-		$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
-
-		if(!$document_srl)
+		$oDocument = getModel('document')->getDocument($document_srl);
+		
+		if(!$oDocument->isExists())
 		{
 			throw new Rhymix\Framework\Exceptions\InvalidRequest;
 		}
 		
+		$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
+		
 		if($module_info->cancel_vote !== 'Y')
 		{
 			throw new Rhymix\Framework\Exception('failed_declared_cancel');
@@ -1664,7 +1666,7 @@ class documentController extends document
 		}
 
 		// Get currently logged in user.
-		$member_srl = intval($this->user->member_srl);
+		$member_srl = $this->user->member_srl;
 		
 		// Check if document's author is a member.
 		if($oDocument->get('member_srl'))
@@ -1782,7 +1784,7 @@ class documentController extends document
 	 */
 	function declaredDocumentCancel($document_srl)
 	{
-		$member_srl = intval($this->user->member_srl);
+		$member_srl = $this->user->member_srl;
 		if(!$_SESSION['declared_document'][$document_srl] && $member_srl)
 		{
 			return new BaseObject(-1, 'failed_declared_cancel');
@@ -1812,6 +1814,12 @@ class documentController extends document
 			$_SESSION['declared_document'][$document_srl] = false;
 			return new BaseObject(-1, 'failed_declared_cancel');
 		}
+		
+		$args = new stdClass();
+		$args->document_srl = $document_srl;
+		$output = executeQuery('document.getDeclaredDocument', $args);
+
+		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
@@ -1823,11 +1831,6 @@ class documentController extends document
 			return $trigger_output;
 		}
 		
-		$args = new stdClass();
-		$args->document_srl = $document_srl;
-		$output = executeQuery('document.getDeclaredDocument', $args);
-
-		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 		if($declared_count > 1)
 		{
 			$output = executeQuery('document.updateDeclaredDocumentCancel', $args);