diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-03 15:55:22 -0700 |
| commit | f2f2b534e611c37105b1dc56470735c13641c944 (patch) | |
| tree | 2eed3379df931bccd56dd7be8e3a56394fa3e0f9 /include/permissions.php | |
| parent | 2d9ae8ff2c581b8981c9c7308c4cf98bfee934b1 (diff) | |
| parent | a9bda2b12e3d393fa854e23207a081052e2e7bfd (diff) | |
| download | volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.gz volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.tar.bz2 volse-hubzilla-f2f2b534e611c37105b1dc56470735c13641c944.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/permissions.php b/include/permissions.php index d21b45550..f719394c5 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -314,11 +314,12 @@ function perm_is_allowed($uid, $observer_xchan, $permission) { 'channel_id' => $uid, 'observer_hash' => $observer_xchan, 'permission' => $permission, - 'result' => false); + 'result' => 'unset'); call_hooks('perm_is_allowed', $arr); - if($arr['result']) - return true; + if($arr['result'] !== 'unset') { + return $arr['result']; + } $global_perms = \Zotlabs\Access\Permissions::Perms(); |