summaryrefslogtreecommitdiffstats
path: root/inc
diff options
context:
space:
mode:
authorSimon Rettberg2017-12-01 13:42:14 +0100
committerSimon Rettberg2017-12-01 13:42:14 +0100
commit561d9831c50937fc192e6bb02bb4b6d08c5602ed (patch)
tree514f4d4b177f341267af1c222bb3536409b6058b /inc
parentMerge branch 'master' into permission-manager (diff)
downloadslx-admin-561d9831c50937fc192e6bb02bb4b6d08c5602ed.tar.gz
slx-admin-561d9831c50937fc192e6bb02bb4b6d08c5602ed.tar.xz
slx-admin-561d9831c50937fc192e6bb02bb4b6d08c5602ed.zip
[inc/User] Fix permission compat to old system
Diffstat (limited to 'inc')
-rw-r--r--inc/user.inc.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/user.inc.php b/inc/user.inc.php
index 13e56cd3..8c1608ae 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -35,7 +35,9 @@ class User
$permission = $module ? $module->getIdentifier().".".$permission : $permission;
return PermissionUtil::userHasPermission(self::$user['userid'], $permission, $locationid);
}
- return (self::$user['permissions'] & (Permission::get($permission) | Permission::get('superadmin'))) != 0;
+ if (self::$user['permissions'] & Permission::get('superadmin'))
+ return true;
+ return (self::$user['permissions'] & Permission::get($permission)) != 0;
}
public static function getAllowedLocations($permission)