diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 17:57:42 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 17:57:42 -0700 |
| commit | 542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20 (patch) | |
| tree | 59aa36f7dfcc89cf4b79340b909cf7dd77f1a234 /Zotlabs/Module/Acl.php | |
| parent | bc8c74eb422387a5537eb923c90a34c1196ce568 (diff) | |
| parent | 1d90c4ea999fd3a440f2c55a90793ac452876ca2 (diff) | |
| download | volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.gz volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.tar.bz2 volse-hubzilla-542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20.zip | |
Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge
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 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 |