diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:00:41 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-07-20 22:00:41 +0200 |
| commit | 4da005e209624b43610aeefe30d7a9f9fe0ac7c0 (patch) | |
| tree | 32e773df730cc764f4a7e0834c1e55f8e8c4880c /Zotlabs | |
| parent | ca82b45fe41ad4ff511959dc2e85c55efcb68bc0 (diff) | |
| download | volse-hubzilla-4da005e209624b43610aeefe30d7a9f9fe0ac7c0.tar.gz volse-hubzilla-4da005e209624b43610aeefe30d7a9f9fe0ac7c0.tar.bz2 volse-hubzilla-4da005e209624b43610aeefe30d7a9f9fe0ac7c0.zip | |
type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid
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 |