From 9752c2ed61b0a7a894e999d4ca89b5c2fb10cd82 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Wed, 21 Oct 2020 23:57:37 +0900
Subject: [PATCH] Fix #1432 incorrect redirect in widget document edit popup

---
 classes/module/ModuleHandler.class.php |  2 +-
 common/framework/router.php            |  1 +
 modules/widget/tpl/js/widget.js        | 12 ++++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 66d5ba14c..db841f92b 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -175,7 +175,7 @@ class ModuleHandler extends Handler
 		}
 
 		// Get module info from document_srl.
-		if($this->document_srl)
+		if($this->document_srl && !$this->module)
 		{
 			$module_info = $this->_checkDocumentSrl();
 			if ($module_info === false)
diff --git a/common/framework/router.php b/common/framework/router.php
index 0d301835b..714b15cea 100644
--- a/common/framework/router.php
+++ b/common/framework/router.php
@@ -122,6 +122,7 @@ class Router
 		{
 			@parse_str(substr($url, $argstart + 1), $args);
 			$url = substr($url, 0, $argstart);
+			$result->args = $args;
 		}
 		
 		// Decode the URL into plain UTF-8.
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 6e89920c9..28b7ea66c 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -424,8 +424,16 @@ function doCheckWidget(e) {
 		var widgetstyle = p_obj.getAttribute("widgetstyle");
 		if(!widget) return;
 		selectedWidget = p_obj;
-		if(widget == 'widgetContent') popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl"), "addContent");
-		else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
+		var url, name;
+		if(widget == 'widgetContent') {
+			url = request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl");
+			name = 'addContent';
+		} else {
+			url = request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle;
+			name = 'GenerateCodeInPage';
+		}
+		console.log(url, name);
+		popopen(url, name);
 		return;
 
 	// 위젯 스타일