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

Fix uninitialized stdClass in rarely used method

Browse source
This commit is contained in:
BJRambo 2016-05-27 07:57:58 +09:00
parent 3bd25f9538
commit 508b6ed340
24 changed files with 68 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/menu/menu.admin.controller.php
View file

@ -190,6 +190,7 @@ class menuAdminController extends menu
else
{
// create menu item.
$item_args = new stdClass();
$item_args->menu_srl = $menuSrl;
$item_args->url = $moduleInfo->mid;
$item_args->name = $moduleInfo->mid;
@ -1466,6 +1467,7 @@ class menuAdminController extends menu
}
elseif($mode == 'insert')
{
$args = new stdClass();
$args->menu_item_srl = $target_srl;
$args->parent_srl = $parent_srl;
$args->listorder = -1*getNextSequence();
@ -2087,6 +2089,7 @@ class menuAdminController extends menu
{
if(!count($menu_srl_list)) return;
// Delete the value of menu_srls
$args = new stdClass();
$args->menu_srls = implode(',',$menu_srl_list);
$output = executeQuery('menu.deleteMenuLayout', $args);
if(!$output->toBool()) return $output;

6
modules/menu/menu.class.php
View file

@ -39,7 +39,7 @@ class menu extends ModuleObject
{
return TRUE;
}
$oMenuAdminModel = getAdminModel('menu');
$args = new stdClass();
@ -95,7 +95,7 @@ class menu extends ModuleObject
$menuItemAllList = array();
foreach($output AS $key=>$value)
{
unset($args);
$args = new stdClass();
$args->menu_srl = $value->menu_srl;
$output2 = executeQueryArray('menu.getMenuItems', $args);
if(is_array($output2->data))
@ -123,7 +123,7 @@ class menu extends ModuleObject
$shortcutItemList = array_diff_assoc($menuItemAllList, $menuItemUniqueList);
foreach($output AS $key=>$value)
{
unset($args);
$args = new stdClass();
$args->menu_srl = $value->menu_srl;
$output2 = executeQueryArray('menu.getMenuItems', $args);
if(is_array($output2->data))