diff options
| author | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
| commit | 95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d (patch) | |
| tree | 582116e7571ae7eaa4a51578b2f5ebeae31f75a9 /Zotlabs/Module/Acl.php | |
| parent | ef2448e17e742e7dcef458993bce1e0a29756aa7 (diff) | |
| parent | 9554f535199b5fb3a23dd40f9921a15339da3bd7 (diff) | |
| download | volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.gz volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.bz2 volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.zip | |
Merge branch 'dev'
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -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 9dc422e6b..f8c6232c5 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -284,7 +284,7 @@ class Acl extends \Zotlabs\Web\Controller { } elseif($type == 'm') { $r = array(); - $z = q("SELECT xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url + $z = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_network as net, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url, abook_self FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and xchan_deleted = 0 |