diff options
| author | marijus <mario@mariovavti.com> | 2014-02-19 19:31:29 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-02-19 19:31:29 +0100 |
| commit | 31d9bf041785e6c8b70891a2fd4ec695c523369b (patch) | |
| tree | 12c7b82b73a08b46324c487a0dbde51f956f0ac1 /include/permissions.php | |
| parent | 3a6760f6d1236905474bb13805e4ebb54561841f (diff) | |
| parent | 24d119b8c4e94ed130577e4e4a8d17ea13c406ac (diff) | |
| download | volse-hubzilla-31d9bf041785e6c8b70891a2fd4ec695c523369b.tar.gz volse-hubzilla-31d9bf041785e6c8b70891a2fd4ec695c523369b.tar.bz2 volse-hubzilla-31d9bf041785e6c8b70891a2fd4ec695c523369b.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/permissions.php b/include/permissions.php index 0cbb5b984..eb1a7966f 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -88,6 +88,11 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // These take priority over all other settings. if($observer_xchan) { + if($r[0][$channel_perm] & PERMS_AUTHED) { + $ret[$perm_name] = true; + continue; + } + if(! $abook_checked) { $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1", @@ -240,6 +245,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { return false; if($observer_xchan) { + if($r[0][$channel_perm] & PERMS_AUTHED) + return true; + $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1", intval($uid), |