aboutsummaryrefslogtreecommitdiffstats
path: root/mod/acl.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-03-20 23:52:55 +0100
committerMario Vavti <mario@mariovavti.com>2016-03-20 23:52:55 +0100
commit513078e1f7945479ccd3656acbb56b888820d24b (patch)
tree44d5c69c21ebc650b449acfe2d6fc704e994ef0b /mod/acl.php
parent1ddb43b0d32ab0dadb3fabc1ed79c96c4365eb77 (diff)
parent23151100dee1051d77d893a616cbc166eb5dcca1 (diff)
downloadvolse-hubzilla-513078e1f7945479ccd3656acbb56b888820d24b.tar.gz
volse-hubzilla-513078e1f7945479ccd3656acbb56b888820d24b.tar.bz2
volse-hubzilla-513078e1f7945479ccd3656acbb56b888820d24b.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod/acl.php')
-rw-r--r--mod/acl.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/acl.php b/mod/acl.php
index 6eeca8af0..146cb74c8 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -93,7 +93,7 @@ function acl_init(&$a){
$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
+ 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())
);
@@ -117,7 +117,7 @@ function acl_init(&$a){
$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self
FROM abook left join xchan on abook_xchan = xchan_hash
- WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
+ WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
if($r2)
$r = array_merge($r,$r2);