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

Merge branch 'develop' into pr/new-config-format

Browse source 
Conflicts:
	common/legacy.php
This commit is contained in:
Kijin Sung 2016-02-07 22:15:27 +09:00
commit e55504e1f4
7 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/module/module.model.php
View file

@ -966,6 +966,7 @@ class moduleModel extends module
$info->action->{$name}->check_csrf = $check_csrf;
if($action->attrs->menu_name)
{
$info->menu->{$action->attrs->menu_name} = new stdClass();
if($menu_index == 'true')
{
$info->menu->{$action->attrs->menu_name}->index = $name;