diff options
author | Mario <mario@mariovavti.com> | 2021-07-29 06:59:13 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-07-29 06:59:13 +0000 |
commit | 9722d157bf138753bc168f68c56b4963db6da4e9 (patch) | |
tree | a15bb81c35a2367fe4628614471d471ed86d2712 /Zotlabs/Module/Acl.php | |
parent | 219d47f04c7bb04dcc241b9ed6ca411fc9653f09 (diff) | |
parent | c6133d2558ce29e44342fa7be8bb65e0059aea02 (diff) | |
download | volse-hubzilla-9722d157bf138753bc168f68c56b4963db6da4e9.tar.gz volse-hubzilla-9722d157bf138753bc168f68c56b4963db6da4e9.tar.bz2 volse-hubzilla-9722d157bf138753bc168f68c56b4963db6da4e9.zip |
Merge branch 'dev' into bs5
Diffstat (limited to 'Zotlabs/Module/Acl.php')
-rw-r--r-- | Zotlabs/Module/Acl.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 862a97bdc..aeb02eeaa 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -222,6 +222,7 @@ class Acl extends \Zotlabs\Web\Controller { WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" , intval(local_channel()) ); + if($r2) $r = array_merge($r2,$r); @@ -282,13 +283,12 @@ class Acl extends \Zotlabs\Web\Controller { } } elseif($type == 'm') { - $r = array(); $z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and xchan_deleted = 0 - and xchan_network IN ('zot', 'diaspora', 'friendica-over-diaspora') + and not xchan_network IN ('rss', 'anon', 'unknown') $sql_extra3 ORDER BY xchan_name ASC ", intval(local_channel()) @@ -371,7 +371,7 @@ class Acl extends \Zotlabs\Web\Controller { ); } if($type !== 'f') { - if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && ($g['net'] == 'zot6' || $g['net'] == 'zot'))) { + if (! array_key_exists($x[$lkey], $contacts) || ($contacts[$x[$lkey]]['net'] !== 'zot6' && $g['net'] == 'zot6')) { $contacts[$x[$lkey]] = array( "type" => "c", "photo" => $g['micro'], |