diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
| commit | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch) | |
| tree | a9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /include/permissions.php | |
| parent | 79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff) | |
| parent | 34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff) | |
| download | volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2 volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip | |
Merge remote branch 'upstream/master'
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; |