diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:01:58 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:01:58 +0200 |
| commit | d54ad9880252cf8c6d2c61a01680279741735a36 (patch) | |
| tree | d6f99985b0d13a11b069610b51c9093d064cf941 /Zotlabs | |
| parent | fd507ff597b298d4b2891c2dd5ec74a9562c78be (diff) | |
| parent | 1d90c4ea999fd3a440f2c55a90793ac452876ca2 (diff) | |
| download | volse-hubzilla-d54ad9880252cf8c6d2c61a01680279741735a36.tar.gz volse-hubzilla-d54ad9880252cf8c6d2c61a01680279741735a36.tar.bz2 volse-hubzilla-d54ad9880252cf8c6d2c61a01680279741735a36.zip | |
Merge branch '1.10RC' into dev
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 2 |
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 |