diff options
| author | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2015-02-16 15:13:31 -0800 |
| commit | d9d029470f188796988e002eb90e9dbf96d3dd29 (patch) | |
| tree | ef922432ae326f358374535bf68492729134e49e /mod/acl.php | |
| parent | ca8e22101803454be60af35d2cf71ae80224805a (diff) | |
| parent | 1d1676094dd82482f113d6de9c2a95407a1a692f (diff) | |
| download | volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.gz volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.tar.bz2 volse-hubzilla-d9d029470f188796988e002eb90e9dbf96d3dd29.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod/acl.php')
| -rw-r--r-- | mod/acl.php | 7 |
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); } } } |