aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-20 17:57:42 -0700
committerredmatrix <git@macgirvin.com>2016-07-20 17:57:42 -0700
commit542fcaff9a1dd47d01b7e88ec0c3f1a2f2430a20 (patch)
tree59aa36f7dfcc89cf4b79340b909cf7dd77f1a234 /Zotlabs
parentbc8c74eb422387a5537eb923c90a34c1196ce568 (diff)
parent1d90c4ea999fd3a440f2c55a90793ac452876ca2 (diff)
downloadvolse-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')
-rw-r--r--Zotlabs/Module/Acl.php2
-rw-r--r--Zotlabs/Zot/Finger.php4
2 files changed, 3 insertions, 3 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
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 229fda8bd..e7603442f 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -28,7 +28,7 @@ class Finger {
if (strpos($webbie,'@') === false) {
$address = $webbie;
- $host = App::get_hostname();
+ $host = \App::get_hostname();
} else {
$address = substr($webbie,0,strpos($webbie,'@'));
$host = substr($webbie,strpos($webbie,'@')+1);
@@ -127,4 +127,4 @@ class Finger {
return $x;
}
-} \ No newline at end of file
+}