From eb3142a434f727935731ae969fe62db9064ff7d3 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 16 Apr 2007 11:43:22 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1174
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/menu/menu.view.php           | 14 +-------------
 modules/menu/tpl/menu_item_info.html |  2 +-
 modules/module/module.model.php      |  2 ++
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/modules/menu/menu.view.php b/modules/menu/menu.view.php
index 8d8758939..07b659368 100644
--- a/modules/menu/menu.view.php
+++ b/modules/menu/menu.view.php
@@ -84,22 +84,10 @@
             Context::set('mid_list', $mid_list);
 
             // 메뉴을 팝업으로 지정
-            $this->setMenuFile('popup_menu');
+            $this->setLayoutFile('popup_layout');
 
             // 템플릿 파일 지정
             $this->setTemplateFile('mid_list');
         }
-
-        /**
-         * @brief 메뉴 목록을 보여줌
-         **/
-        function dispMenuAdminDownloadedList() {
-            // 메뉴 목록을 세팅
-            $oMenuModel = &getModel('menu');
-            $menu_list = $oMenuModel->getDownloadedMenuList();
-            Context::set('menu_list', $menu_list);
-
-            $this->setTemplateFile('downloaded_menu_list');
-        }
     }
 ?>
diff --git a/modules/menu/tpl/menu_item_info.html b/modules/menu/tpl/menu_item_info.html
index 243429cb5..89ada41c8 100644
--- a/modules/menu/tpl/menu_item_info.html
+++ b/modules/menu/tpl/menu_item_info.html
@@ -19,7 +19,7 @@
 </tr>
 <tr>
     <th rowspan="2">{$lang->menu_url}</th>
-    <td><input type="text" name="menu_url" value="{htmlspecialchars($item_info->url)}" /><input type="button" value="{$lang->cmd_search_mid}" onclick="popopen('{getUrl('module','menu','act','dispMenuAdminMidList','menu_id', $menu_id)}');return false;"/></td>
+    <td><input type="text" name="menu_url" value="{htmlspecialchars($item_info->url)}" /><input type="button" value="{$lang->cmd_search_mid}" onclick="popopen('{getUrl('module','menu','act','dispMenuAdminMidList')}');return false;"/></td>
 </tr>
 <tr>
     <td>{$lang->about_menu_url}</td>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 438540e5e..8058d1091 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -118,7 +118,9 @@
 
             $list = $output->data;
             if(!$list) return;
+
             if(!is_array($list)) $list = array($list);
+
             foreach($list as $val) {
                 $mid_list[$val->mid] = $val;
             }