From 2b8954cb96473155614f085a1adb96f4e05d087d Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Tue, 9 Jun 2015 15:20:17 +0900
Subject: [PATCH] =?UTF-8?q?fix=20#1522=20=EA=B2=80=EC=83=89=20=EC=A0=9C?=
 =?UTF-8?q?=ED=95=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=EB=A5=BC=20message?=
 =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=9D=84=20=EC=9D=B4=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration_search/integration_search.view.php  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index 3686725d3..79d3c6933 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -74,7 +74,18 @@ class integration_searchView extends integration_search
 		else
 			$module_srl_list = explode(',',$config->target_module_srl);
 
-		if($target === 'include' && !count($module_srl_list)) return new Object(-1, ($logged_info->is_admin === 'Y') ? 'msg_admin_not_enabled' : 'msg_not_enabled');
+		// https://github.com/xpressengine/xe-core/issues/1522
+		// 검색 대상을 지정하지 않았을 때 검색 제한
+		if($target === 'include' && !count($module_srl_list))
+		{
+			$oMessageObject = ModuleHandler::getModuleInstance('message');
+			$oMessageObject->setError(-1);
+			$oMessageObject->setMessage('msg_not_enabled');
+			$oMessageObject->dispMessage();
+			$this->setTemplatePath($oMessageObject->getTemplatePath());
+			$this->setTemplateFile($oMessageObject->getTemplateFile());
+			return;
+		}
 
 		// Set a variable for search keyword
 		$is_keyword = Context::get('is_keyword');