diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2019-03-19 13:13:21 +1100 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2019-03-19 13:13:21 +1100 |
| commit | 4c25072c182d3afba5b131d9093d0342e1313ceb (patch) | |
| tree | 22db10dac69a87fb42a85b7c99dfc6bad4f774d2 /include | |
| parent | 564ec3252080f435e38d4479eb38032ca164dbf1 (diff) | |
| parent | a743feb04013527e2054d30c629373820f11aa27 (diff) | |
| download | volse-hubzilla-4c25072c182d3afba5b131d9093d0342e1313ceb.tar.gz volse-hubzilla-4c25072c182d3afba5b131d9093d0342e1313ceb.tar.bz2 volse-hubzilla-4c25072c182d3afba5b131d9093d0342e1313ceb.zip | |
Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/zot.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php index c9c01103c..227d82a13 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1712,13 +1712,17 @@ function allowed_public_recips($msg) { $condensed_recips[] = $rr['hash']; $results = array(); - $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ", + $r = q("select channel_hash as hash, channel_id from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ", dbesc($hash) ); if($r) { - foreach($r as $rr) + foreach($r as $rr) { + $cfg = get_abconfig($rr['channel_id'],$rr['hash'],'their_perms','view_stream'); + if((! $cfg) && $scope !== 'any connections') + continue; if(in_array($rr['hash'],$condensed_recips)) $results[] = array('hash' => $rr['hash']); + } } return $results; } |