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

Merge branch 'develop' of https://github.com/rhymix/rhymix into pr/nohtml

Browse source 
# Conflicts:
#	modules/module/module.model.php
This commit is contained in:
conory 2017-07-13 22:48:02 +09:00
commit 146975f277
7 changed files with 92 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/document/document.model.php
View file

@ -980,7 +980,7 @@ class documentModel extends document
// Get a list of member groups
$oMemberModel = getModel('member');
$group_list = $oMemberModel->getGroups($module_info->site_srl);
$group_list = $oMemberModel->getGroups();
Context::set('group_list', $group_list);
$security = new Security();