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

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/menu/menu.admin.view.php
View file

@ -118,6 +118,16 @@
**/
function dispMenuAdminSiteMap()
{
Context::loadLang(_XE_PATH_.'modules/document/lang/');
$site_srl = Context::get('site_srl');
$site_module_info = Context::get('site_module_info');
if(!$site_srl)
{
if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
else $site_srl = (int)$site_module_info->site_srl;
}
$oMenuAdminModel = &getAdminModel('menu');
$menuListFromDB = $oMenuAdminModel->getMenus();
if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
@ -157,7 +167,7 @@
// get installed module list
$oPageController = &getController('page'); //for lang
$resultModuleList = $oMenuAdminModel->getModuleListInSitemap();
$resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl);
Context::set('module_list', $resultModuleList);
// get default group list