aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 13:39:10 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 13:39:10 -0700
commitdf0cd4dbc7fbd4d31a953144e0af75ab27447969 (patch)
tree0d028db4f797eda31bc471ae505a1da3b7000bbf /Zotlabs
parenta3e5307b93ea524781abd885e26a5d6c8f5c4c54 (diff)
parentd54ad9880252cf8c6d2c61a01680279741735a36 (diff)
downloadvolse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.gz
volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.tar.bz2
volse-hubzilla-df0cd4dbc7fbd4d31a953144e0af75ab27447969.zip
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Acl.php3
-rw-r--r--Zotlabs/Zot/Finger.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 4e746e218..03dc6c5d3 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -237,8 +237,9 @@ class Acl extends \Zotlabs\Web\Controller {
}
}
elseif($type == 'm') {
+
$r = array();
- $z = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url
+ $z = 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 xchan_deleted = 0
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 9d373b2e6..e7603442f 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -127,4 +127,4 @@ class Finger {
return $x;
}
-} \ No newline at end of file
+}