From d3cb41a17bbc7e6fc830dbb1c2ffb36121413385 Mon Sep 17 00:00:00 2001
From: ucorina <corina.udrescu@gmail.com>
Date: Thu, 20 Sep 2012 14:36:17 +0000
Subject: [PATCH] Issue 2511:	Make XE menu work with virtual sites too

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11404 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/menu/tpl/sitemap.html              | 6 +++---
 modules/module/module.admin.controller.php | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 0edb4b1bd..c16b40ab4 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -18,7 +18,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
 <input type="hidden" name="act" value="procMenuAdminArrangeItem" />
 <input type="hidden" name="menu_srl" value="{$menuSrl}" />
 <input type="hidden" name="menu_item_srl" value="" />
-<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_{$menuSrl}" />
+<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}#menuTop_{$menuSrl}" />
 
 	<h2 class="h2" id="menuTop_{$menuSrl}"><input name="title" value="{$value->title}" /></h2>
 	<a href="#nav_{$key}" class="tgMap">{$lang->collapsing}/{$lang->expanding}</a>
@@ -43,7 +43,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
 <input type="hidden" name="module" value="{$module}" />
 <input type="hidden" name="act" value="procMenuAdminInsert" />
 <input type="hidden" name="title" value="{$lang->untitle}" />
-<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
+<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}" />
 <div class="btnArea">
 	<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}</button></span>
 </div>
@@ -57,7 +57,7 @@ jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMe
 		<input type="hidden" name="menu_item_srl" value="{$menu_info->menu_srl}" />
 		<input type="hidden" name="parent_srl" value="{$menu_info->menu_srl}" />
 		<input type="hidden" name="module_srl" value="" />
-		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
+		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', ($module ? $module : 'admin'), 'act', 'dispMenuAdminSiteMap')}#menuTop_" />
 		<h2 class="h2"><span>{$lang->add_menu}</span><span>{$lang->edit_menu}</span></h2>
 			<ul>
 				<li>
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index b5fffe4ae..46b547010 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -624,6 +624,7 @@
             // Variable setting for site keyword
             $site_keyword = Context::get('site_keyword');
             $site_srl = Context::get('site_srl');
+            $vid = Context::get('vid');
             // If there is no site keyword, use as information of the current virtual site
             $args = null;
             $logged_info = Context::get('logged_info');
@@ -632,7 +633,7 @@
 
 			if(!$site_srl)
 			{
-				if($logged_info->is_admin == 'Y' && !$site_keyword) $args->site_srl = 0;
+				if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
 				else $args->site_srl = (int)$site_module_info->site_srl;
 			}
 			else $args->site_srl = $site_srl;