잘못된 동작 수정

This commit is contained in:
conory 2017-04-08 22:41:01 +09:00
parent 5ad0ee91a5
commit 3298946a5e

View file

@ -297,12 +297,17 @@ class ModuleObject extends Object
if($permission)
{
// If permission is 'member', check logged-in
if($permission == 'member' && !Context::get('is_logged'))
if($permission == 'member')
{
if(!Context::get('is_logged'))
{
return false;
}
}
// If permission is 'manager', check 'is user have manager privilege(granted)'
else if(preg_match('/^(manager|([a-z0-9\_]+)-managers)$/', $permission, $type) && !$grant->manager)
else if(preg_match('/^(manager|([a-z0-9\_]+)-managers)$/', $permission, $type))
{
if(!$grant->manager)
{
// If permission is '*-managers', search modules to find manager privilege of the member
if(Context::get('is_logged') && $find && isset($type[2]))
@ -326,6 +331,7 @@ class ModuleObject extends Object
return false;
}
}
// If permission is 'root', Error!
// Because an administrator who have root privilege(granted) was passed already
else if($permission == 'root')