From 8dfa3688e61bc6bedc3504e34f40dedeb2f8ec7c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 10 Mar 2009 01:05:05 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=EB=93=B1=EC=9D=84=20=EC=A7=80=EC=A0=95=ED=95=A0?=
 =?UTF-8?q?=EB=95=8C=20=EC=9A=94=EC=B2=AD=EB=90=9C=20=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=98=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EC=A0=9C=EB=8C=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=97=B0=EA=B2=B0=EC=8B=9C=ED=82=A4=EC=A7=80=20?=
 =?UTF-8?q?=EB=AA=BB=ED=95=B4=20=EA=B6=8C=ED=95=9C=EC=9D=B4=20=EC=97=86?=
 =?UTF-8?q?=EB=8B=A4=EA=B3=A0=20=EB=82=98=EC=98=A4=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5818 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/module/ModuleHandler.class.php          | 8 ++++----
 modules/module/tpl/skin_config.html             | 1 +
 modules/page/tpl/filter/insert_page_content.xml | 1 +
 modules/page/tpl/page_content_modify.html       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 902d4e78a..9bd0c4bdc 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -107,15 +107,15 @@
             // 모듈정보를 구하지 못했고 mid 요청이 있으면 mid에 해당하는 모듈 정보를 구함
             if(!$module_info && $this->mid) {
                 $module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
-                if($this->module && $module_info->module != $this->module) unset($module_info);
+                //if($this->module && $module_info->module != $this->module) unset($module_info);
             }
 
             // 모듈을 여전히(;;) 못 찾고 모듈번호(module_srl)가 있으면 해당 모듈을 구함
             // module_srl로 대상 모듈을 찾는 것을 주석 처리함.
-            //if(!$module_info && $this->module_srl) {
-                //$module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl);
+            if(!$module_info && $this->module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl);
                 //if($this->module && $module_info->module != $this->module) unset($module_info);
-            //}
+            }
 
             // 역시 모듈을 못 찾았고 $module이 없다면 기본 모듈을 찾아봄
             if(!$module_info && !$this->module) $module_info = $site_module_info;
diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html
index bedf668ae..bcb3686ed 100644
--- a/modules/module/tpl/skin_config.html
+++ b/modules/module/tpl/skin_config.html
@@ -1,5 +1,6 @@
 <form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
 <input type="hidden" name="module" value="module" />
+<input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="act" value="procModuleAdminUpdateSkinInfo" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 <input type="hidden" name="page" value="{$page}" />
diff --git a/modules/page/tpl/filter/insert_page_content.xml b/modules/page/tpl/filter/insert_page_content.xml
index 05a2c2166..542bbe047 100644
--- a/modules/page/tpl/filter/insert_page_content.xml
+++ b/modules/page/tpl/filter/insert_page_content.xml
@@ -4,6 +4,7 @@
     </form>
     <parameter>
         <param name="module_srl" target="module_srl" />
+        <param name="mid" target="mid" />
         <param name="content" target="content" />
     </parameter>
     <response callback_func="completeInsertPageContent">
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html
index 286b623ab..629cbb70c 100644
--- a/modules/page/tpl/page_content_modify.html
+++ b/modules/page/tpl/page_content_modify.html
@@ -10,7 +10,7 @@
 <div class="clear"></div>
 <div class="adminLayer">
     <form action="./" method="post" id="pageFo" onsubmit="return doSubmitPageContent(this);">
-        <input type="hidden" name="mid" value="" />
+        <input type="hidden" name="mid" value="{$module_info->mid}" />
         <input type="hidden" name="module" value="page" />
         <input type="hidden" name="act" value="dispPageAdminContentModify" />
         <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />