diff options
author | zotlabs <mike@macgirvin.com> | 2018-07-30 17:41:37 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-07-30 17:41:37 -0700 |
commit | e8aeecc4c9842d4c6b25f7b488ede9644afc5d78 (patch) | |
tree | 5917ab02693599f5a069667c404f32a1dd649c86 /include/zot.php | |
parent | 32614e4074758d6112993d71169664a3c29e90b2 (diff) | |
download | volse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.tar.gz volse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.tar.bz2 volse-hubzilla-e8aeecc4c9842d4c6b25f7b488ede9644afc5d78.zip |
When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 5c74947d6..5c79dd4fa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -491,7 +491,7 @@ function zot_refresh($them, $channel = null, $force = false) { $profile_assign = get_pconfig($channel['channel_id'],'system','profile_assign',''); // Keep original perms to check if we need to notify them - $previous_perms = get_all_perms($channel['channel_id'],$x['hash']); + $previous_perms = get_all_perms($channel['channel_id'],$x['hash'],false); $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", dbesc($x['hash']), @@ -560,7 +560,7 @@ function zot_refresh($them, $channel = null, $force = false) { if($y) { logger("New introduction received for {$channel['channel_name']}"); - $new_perms = get_all_perms($channel['channel_id'],$x['hash']); + $new_perms = get_all_perms($channel['channel_id'],$x['hash'],false); // Send a clone sync packet and a permissions update if permissions have changed @@ -4419,7 +4419,7 @@ function zotinfo($arr) { if(! $ret['follow_url']) $ret['follow_url'] = z_root() . '/follow?f=&url=%s'; - $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false); + $permissions = get_all_perms($e['channel_id'],$ztarget_hash,false,false); if($ztarget_hash) { $permissions['connected'] = false; |