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

Merge branch 'develop' into pr/cache-refactor

Browse source 
Conflicts:
	modules/ncenterlite/ncenterlite.controller.php
This commit is contained in:
Kijin Sung 2016-04-23 11:25:32 +09:00
commit 3b8db58954
30 changed files with 192 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/member/member.controller.php
View file

@ -1910,9 +1910,14 @@ class memberController extends member
function addMemberMenu($act, $str)
{
$logged_info = Context::get('logged_info');
if(!is_object($logged_info))
{
return;
}
$logged_info->menu_list[$act] = lang($str);
Context::set('logged_info', $logged_info);
}