diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-04-08 11:09:55 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-04-08 11:09:55 +0200 |
| commit | 70777a047d3e952b15b418406a46b7983af60cec (patch) | |
| tree | 6322a8d829bf5e34c1a0ee8f6a2944ec0c3a3014 | |
| parent | 28c32594498d91bf2307eba19bd9f58af217eb68 (diff) | |
| parent | a93bd8d944f8b4e35aa27ca417a4e6831f8dd7b5 (diff) | |
| download | volse-hubzilla-70777a047d3e952b15b418406a46b7983af60cec.tar.gz volse-hubzilla-70777a047d3e952b15b418406a46b7983af60cec.tar.bz2 volse-hubzilla-70777a047d3e952b15b418406a46b7983af60cec.zip | |
Merge branch 'master' of https://framagit.org/hubzilla/core
| -rw-r--r-- | include/permissions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/permissions.php b/include/permissions.php index 115d96eca..1dcd6accb 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -192,7 +192,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ // They are in your address book, but haven't been approved - if($channel_perm & PERMS_PENDING) { + if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) { $ret[$perm_name] = true; continue; } @@ -316,6 +316,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = if(! $x) { // not in address book and no guest token, see if they've got an xchan + $y = q("select xchan_network from xchan where xchan_hash = '%s' limit 1", dbesc($observer_xchan) ); @@ -327,7 +328,6 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = } $abperms = load_abconfig($uid,$observer_xchan,'my_perms'); } - // system is blocked to anybody who is not authenticated @@ -382,7 +382,7 @@ function perm_is_allowed($uid, $observer_xchan, $permission, $check_siteblock = // They are in your address book, but haven't been approved - if($channel_perm & PERMS_PENDING) { + if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) { return true; } |