diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-10-01 19:26:21 +0200 |
| commit | 9cce852ac71fcd12970e985f1f61697333849172 (patch) | |
| tree | c40ce5543c412035ca03188f7bd9e565efb62117 /include/permissions.php | |
| parent | a548f644d05f330a2b70c87df821bce05007c979 (diff) | |
| parent | f19d718631675d38efca1741f46bf0916af72a65 (diff) | |
| download | volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.gz volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.tar.bz2 volse-hubzilla-9cce852ac71fcd12970e985f1f61697333849172.zip | |
Merge from upstream
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/permissions.php b/include/permissions.php index 438b807d0..61ac8aea3 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -722,6 +722,11 @@ function get_role_perms($role) { } + $x = get_config('system','role_perms'); + // let system settings over-ride any or all + if($x && is_array($x) && array_key_exists($role,$x)) + $ret = array_merge($ret,$x[$role]); + call_hooks('get_role_perms',$ret); return $ret; |