fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 2884: problem of menu selector when that are virtual site

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12658 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2013-02-01 02:51:22 +00:00
parent 06cf8adc35
commit afc2d40d30
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/menu/menu.admin.model.php
View file

@ -434,7 +434,7 @@ class menuAdminModel extends menu
{ {
foreach($menu->list AS $key=>$value) foreach($menu->list AS $key=>$value)
{ {
$this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl); $this->_menuInfoSetting($menu->list[$key], $start_module, $isMenuFixed, $menuSrl,$siteSrl);
} }
} }
@ -474,7 +474,7 @@ class menuAdminModel extends menu
{ {
foreach($menu->list AS $key2=>$value2) foreach($menu->list AS $key2=>$value2)
{ {
$this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl); $this->_menuInfoSetting($menu->list[$key2], $start_module, $isMenuFixed, $value->menu_srl,$siteSrl);
} }
} }
@ -502,7 +502,6 @@ class menuAdminModel extends menu
} }
} }
ksort($menuList); ksort($menuList);
$this->add('menuList', $menuList); $this->add('menuList', $menuList);
} }
@ -553,7 +552,7 @@ class menuAdminModel extends menu
* @param array $menu * @param array $menu
* @return void * @return void
*/ */
private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl) private function _menuInfoSetting(&$menu, &$start_module, &$isMenuFixed, $menuSrl,$siteSrl = 0)
{ {
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
// if url is empty and is_shortcut is 'N', change to is_shortcut 'Y' // if url is empty and is_shortcut is 'N', change to is_shortcut 'Y'
@ -577,7 +576,7 @@ class menuAdminModel extends menu
{ {
unset($midInfo); unset($midInfo);
unset($moduleInfo); unset($moduleInfo);
$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], 0); $midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], $siteSrl);
$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module); $moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
if($moduleInfo->setup_index_act) if($moduleInfo->setup_index_act)
{ {