From f1b13961783fd13de36592c93919bf4e613665a4 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Mon, 10 Oct 2011 09:14:19 +0000
Subject: [PATCH] issue 370 when menu url is relative path, must showed url
 type in sitemap

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9534 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/conf/module.xml      |  4 ++--
 modules/menu/menu.admin.model.php | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml
index f3f7e816a..217cb4cf9 100644
--- a/modules/menu/conf/module.xml
+++ b/modules/menu/conf/module.xml
@@ -3,11 +3,11 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispMenuAdminContent" type="view" admin_index="true" standalone="true" />
+        <action name="dispMenuAdminContent" type="view" standalone="true" />
         <action name="dispMenuAdminInsert" type="view" standalone="true" />
         <action name="dispMenuAdminManagement" type="view" standalone="true" />
         <action name="dispMenuAdminMidList" type="view" standalone="true" />
-        <action name="dispMenuAdminSiteMap" type="view" standalone="true" menu_name="siteMap" menu_index="true" />
+        <action name="dispMenuAdminSiteMap" type="view" standalone="true" admin_index="true" menu_name="siteMap" menu_index="true" />
 
         <action name="getMenuAdminTplInfo" type="model" standalone="true" />
         <action name="getMenuAdminItemInfo" type="model" standalone="true" />
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index e55cafb60..7bcefb108 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -122,9 +122,13 @@
 			{
 				$oModuleModel = &getModel('module');
 				$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url);
-				if($moduleInfo->mid == $menuItem->url) {
-					$menuItem->moduleType = $moduleInfo->module;
-					$menuItem->pageType = $moduleInfo->page_type;
+				if(!$moduleInfo) $menuItem->moduleType = 'url';
+				else
+				{
+					if($moduleInfo->mid == $menuItem->url) {
+						$menuItem->moduleType = $moduleInfo->module;
+						$menuItem->pageType = $moduleInfo->page_type;
+					}
 				}
 			}
 			else $menuItem->moduleType = 'url';