aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-25 18:41:19 -0700
committerzotlabs <mike@macgirvin.com>2018-04-25 18:41:19 -0700
commitf923d21df341546e054eb0f9628891365c4c2d62 (patch)
treebcbd5ca129c235c19bb7b0f6e319834d99eb26e6 /Zotlabs
parent5a9e9284c260c8bb880987c0942a9fe040442a2b (diff)
downloadvolse-hubzilla-f923d21df341546e054eb0f9628891365c4c2d62.tar.gz
volse-hubzilla-f923d21df341546e054eb0f9628891365c4c2d62.tar.bz2
volse-hubzilla-f923d21df341546e054eb0f9628891365c4c2d62.zip
some tagging work
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Acl.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 35594ae9f..b1f75263d 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -268,15 +268,15 @@ class Acl extends \Zotlabs\Web\Controller {
});
}
}
- if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_channel(),'system','taganyone'))) {
- if((count($r) < 100) && $type == 'c') {
- $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self
- FROM xchan
- WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"
- );
- if($r2)
- $r = array_merge($r,$r2);
- }
+ if((count($r) < 100) && $type == 'c') {
+ $r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self
+ FROM xchan
+ WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc"
+ );
+ if($r2) {
+ $r = array_merge($r,$r2);
+ $r = unique_multidim_array($r,'hash');
+ }
}
}
elseif($type == 'm') {