aboutsummaryrefslogtreecommitdiffstats
path: root/mod/acl.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-15 18:38:26 -0800
committerfriendica <info@friendica.com>2015-02-15 18:38:26 -0800
commit9067d4c15729debea75ffea6931dd97c0f683fb5 (patch)
tree8b8cf58ee668bddb00a592e83b113e62c0177ac3 /mod/acl.php
parent9ba21f82cb52773ce41261a41889795a81cfcb88 (diff)
downloadvolse-hubzilla-9067d4c15729debea75ffea6931dd97c0f683fb5.tar.gz
volse-hubzilla-9067d4c15729debea75ffea6931dd97c0f683fb5.tar.bz2
volse-hubzilla-9067d4c15729debea75ffea6931dd97c0f683fb5.zip
taganyone wasn't working
Diffstat (limited to 'mod/acl.php')
-rw-r--r--mod/acl.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/mod/acl.php b/mod/acl.php
index 6ae803596..e919bb912 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -99,6 +99,7 @@ function acl_init(&$a){
intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED),
intval(XCHAN_FLAGS_DELETED)
);
+
}
else { // Visitors
$r = q("SELECT xchan_hash 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
@@ -148,12 +149,14 @@ function acl_init(&$a){
}
}
if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_channel(),'system','taganyone'))) {
- if((! $r) && $type == 'c') {
- $r = 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
+ 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
FROM xchan
WHERE not (xchan_flags & %d )>0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
intval(XCHAN_FLAGS_DELETED)
);
+ if($r2)
+ $r = array_merge($r,$r2);
}
}
}