fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-29 23:32:54 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 449, removed default value of 2nd argument of getModuleInfoByMid()

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9636 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-10-13 07:46:58 +00:00
parent cbaa09ea3d
commit 3ea1e07541
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@
$args->menu_srl = $menu_srl;
$output = executeQuery('menu.getMenu', $args);
if(!$output->data) return;
$menu_info = $output->data;
$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
@ -77,7 +77,7 @@
$args->title = $title;
$output = executeQuery('menu.getMenuByTitle', $args);
if(!$output->data) return;
$menu_info = $output->data;
$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl);
$menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl);
@ -121,7 +121,7 @@
else if(!preg_match('/^http/i',$menuItem->url))
{
$oModuleModel = &getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url);
$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
if(!$moduleInfo) $menuItem->moduleType = 'url';
else
{
@ -216,15 +216,15 @@
}
Context::set('item_info', $item_info);
//Security
$security = new Security();
$security = new Security();
$security->encodeHTML('group_list..title');
$security->encodeHTML('item_info.url');
$security->encodeHTML('item_info.name');
$security->encodeHTML('item_info.name');
// Compile the template file into tpl variable and then return it
$oTemplate = &TemplateHandler::getInstance();
$tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
$tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
$this->add('tpl', str_replace("\n"," ",$tpl));
}