diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-06-07 03:46:43 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-06-07 03:46:43 +0100 |
| commit | 466a6d5227fbaf0a36cd76b5603cb42bb1b7462b (patch) | |
| tree | 395936a63e27fa105e0dc69d13c1b951dc9e9439 /include/permissions.php | |
| parent | dc6472e046ee6ac0afc934e8ad1edc1e281a3cb0 (diff) | |
| parent | c21f8c68e39e22a0348e5717109f0005d4d35809 (diff) | |
| download | volse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.tar.gz volse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.tar.bz2 volse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/permissions.php b/include/permissions.php index a8f8d2629..071a599f8 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -98,7 +98,7 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // If they're blocked - they can't read or write - if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) { + if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) { $ret[$perm_name] = false; continue; } @@ -242,7 +242,7 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { // If they're blocked - they can't read or write - if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) + if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) return false; if(($x) && (! $global_perms[$permission][2]) && ($x[0]['abook_flags'] & ABOOK_FLAG_IGNORED)) |