diff options
| author | Mario <mario@mariovavti.com> | 2020-06-15 07:04:40 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-06-15 07:04:40 +0000 |
| commit | 570497071d7dc231be6ab0eee951c22f1ad05df2 (patch) | |
| tree | ebb43b6121c948f211108216202c782389774f6b /Zotlabs/Module/Wfinger.php | |
| parent | 49dee6312f64be7b76bdf3902f971080d5c68cd6 (diff) | |
| parent | ec4dea0920f1f5a3cc1899ca2302acd71ceb0405 (diff) | |
| download | volse-hubzilla-570497071d7dc231be6ab0eee951c22f1ad05df2.tar.gz volse-hubzilla-570497071d7dc231be6ab0eee951c22f1ad05df2.tar.bz2 volse-hubzilla-570497071d7dc231be6ab0eee951c22f1ad05df2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Wfinger.php')
| -rw-r--r-- | Zotlabs/Module/Wfinger.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Zotlabs/Module/Wfinger.php b/Zotlabs/Module/Wfinger.php index efb380033..d24a31a15 100644 --- a/Zotlabs/Module/Wfinger.php +++ b/Zotlabs/Module/Wfinger.php @@ -163,13 +163,13 @@ class Wfinger extends \Zotlabs\Web\Controller { else { $result['links'] = [ - + [ 'rel' => 'http://webfinger.net/rel/avatar', 'type' => $r[0]['xchan_photo_mimetype'], 'href' => $r[0]['xchan_photo_l'] ], - + [ 'rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', @@ -181,12 +181,11 @@ class Wfinger extends \Zotlabs\Web\Controller { 'href' => z_root() ], - [ 'rel' => 'http://webfinger.net/rel/profile-page', 'href' => z_root() . '/profile/' . $r[0]['channel_address'], ], - + [ 'rel' => 'http://schemas.google.com/g/2010#updates-from', 'type' => 'application/atom+xml', @@ -197,7 +196,7 @@ class Wfinger extends \Zotlabs\Web\Controller { 'rel' => 'http://webfinger.net/rel/blog', 'href' => z_root() . '/channel/' . $r[0]['channel_address'], ], - + [ 'rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => z_root() . '/follow?f=&url={uri}', @@ -220,7 +219,6 @@ class Wfinger extends \Zotlabs\Web\Controller { 'href' => z_root() . '/owa', ], - [ 'rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,' . salmon_key($r[0]['channel_pubkey']), @@ -242,7 +240,6 @@ class Wfinger extends \Zotlabs\Web\Controller { $arr = [ 'channel' => $r[0], 'pchan' => $pchan, 'request' => $_REQUEST, 'result' => $result ]; call_hooks('webfinger',$arr); - json_return_and_die($arr['result'],'application/jrd+json'); } |