aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-20 21:22:53 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-20 21:22:53 -0400
commitd504197a786eb46a780278fccb529daa13bfa443 (patch)
treec7ec1a3bcc16081ccc2b880a15624922d907787c /Zotlabs/Module/Acl.php
parent99f7dd0fd42b4e29715c86062691877653a8b022 (diff)
parentd54ad9880252cf8c6d2c61a01680279741735a36 (diff)
downloadvolse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.tar.gz
volse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.tar.bz2
volse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.zip
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'Zotlabs/Module/Acl.php')
-rw-r--r--Zotlabs/Module/Acl.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 15609c3c8..76a001fdd 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -222,7 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
}
elseif($type == 'm') {
- $r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
+ $r = q("SELECT xchan_hash as hash, xchan_name as name, 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 ( (abook_their_perms = null) or (abook_their_perms & %d )>0)
and xchan_deleted = 0