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

Merge pull request #2 from kijin/crazymerge

Browse source 
Crazymerge
This commit is contained in:
CONORY 2015-12-18 13:25:41 +09:00
commit 890a5dbfe9
185 changed files with 3108 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/module/module.controller.php
View file

@ -457,7 +457,7 @@ class moduleController extends module
$args->browser_title = strip_tags($args->browser_title);
if($isMenuCreate == TRUE)
if($isMenuCreate === TRUE)
{
$menuArgs = new stdClass;
$menuArgs->menu_srl = $args->menu_srl;
@ -521,6 +521,15 @@ class moduleController extends module
*/
function updateModule($args)
{
if(isset($args->isMenuCreate))
{
$isMenuCreate = $args->isMenuCreate;
}
else
{
$isMenuCreate = TRUE;
}
$output = $this->arrangeModuleInfo($args, $extra_vars);
if(!$output->toBool()) return $output;
// begin transaction
@ -585,22 +594,25 @@ class moduleController extends module
return $output;
}
$menuArgs = new stdClass;
$menuArgs->url = $module_info->mid;
$menuArgs->site_srl = $module_info->site_srl;
$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
if($menuOutput->data && count($menuOutput->data))
if($isMenuCreate === TRUE)
{
$oMenuAdminController = getAdminController('menu');
foreach($menuOutput->data as $itemInfo)
$menuArgs = new stdClass;
$menuArgs->url = $module_info->mid;
$menuArgs->site_srl = $module_info->site_srl;
$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
if($menuOutput->data && count($menuOutput->data))
{
$itemInfo->url = $args->mid;
$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
if(!$updateMenuItemOutput->toBool())
$oMenuAdminController = getAdminController('menu');
foreach($menuOutput->data as $itemInfo)
{
$oDB->rollback();
return $updateMenuItemOutput;
$itemInfo->url = $args->mid;
$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
if(!$updateMenuItemOutput->toBool())
{
$oDB->rollback();
return $updateMenuItemOutput;
}
}
}
}