From 2aa2c633aa9a24f0b69ced742fc16506c3df3127 Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Thu, 18 Aug 2016 16:02:26 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A9=94?=
 =?UTF-8?q?=EB=89=B4=20=EC=84=A4=EC=A0=95=EC=8B=9C=20url=EC=9D=B4=20?=
 =?UTF-8?q?=EC=9E=98=EB=AA=BB=20=EC=A7=80=EC=A0=95=EB=90=98=EC=97=88?=
 =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/menu/menu.admin.controller.php | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 8f96a638a..fdb4a0351 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -1601,25 +1601,23 @@ class menuAdminController extends menu
 		$oModuleModel = getModel('module');
 		//$info = $oModuleModel->getModuleInfoXml($moduleName);
 		$info = $oModuleModel->getModuleActionXml($moduleName);
-
-		$url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin', 'act', $info->admin_index_act);
-		if(empty($url)) $url = getNotEncodedFullUrl('', 'module', 'admin');
-
+		
 		$args = new stdClass();
+		$args->url = 'index.php?module=admin';
+		
+		if($info->menu->{$menuName}->index)
+		{
+			$args->url .= '&act=' . $info->menu->{$menuName}->index;
+		}
+		else if($info->admin_index_act)
+		{
+			$args->url .= '&act=' . $info->admin_index_act;
+		}
+		
 		$args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl;
 		$args->parent_srl = $requestArgs->parent_srl;
 		$args->menu_srl = $requestArgs->menu_srl;
 		$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
-		//if now page is https...
-		if(strpos($url, 'https') !== false)
-		{
-			$args->url = str_replace('https'.substr(Context::getDefaultUrl(), 4), '', $url);
-		}
-		else
-		{
-			$args->url = str_replace(Context::getDefaultUrl(), '', $url);
-		}
 		$args->open_window = 'N';
 		$args->expand = 'N';
 		$args->normal_btn = '';