diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-20 21:22:53 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-20 21:22:53 -0400 |
| commit | d504197a786eb46a780278fccb529daa13bfa443 (patch) | |
| tree | c7ec1a3bcc16081ccc2b880a15624922d907787c | |
| parent | 99f7dd0fd42b4e29715c86062691877653a8b022 (diff) | |
| parent | d54ad9880252cf8c6d2c61a01680279741735a36 (diff) | |
| download | volse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.tar.gz volse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.tar.bz2 volse-hubzilla-d504197a786eb46a780278fccb529daa13bfa443.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
| -rw-r--r-- | Zotlabs/Module/Acl.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Zot/Finger.php | 4 |
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 +} |