aboutsummaryrefslogtreecommitdiffstats
path: root/mod/wfinger.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-02-19 22:28:57 +0100
committerMario Vavti <mario@mariovavti.com>2016-02-19 22:28:57 +0100
commitfbc6c60805d733e16a3ff7fdf60f564ce69fab64 (patch)
treea17a162fef7d8d3a79a22f2363eae3f4336acd6a /mod/wfinger.php
parent02e82e496e3ec8dbd8264248ad8550dd5e335cba (diff)
parent8e586008dd8cceb02fc5378d11fce9673a0d5e41 (diff)
downloadvolse-hubzilla-fbc6c60805d733e16a3ff7fdf60f564ce69fab64.tar.gz
volse-hubzilla-fbc6c60805d733e16a3ff7fdf60f564ce69fab64.tar.bz2
volse-hubzilla-fbc6c60805d733e16a3ff7fdf60f564ce69fab64.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod/wfinger.php')
-rw-r--r--mod/wfinger.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/mod/wfinger.php b/mod/wfinger.php
index 5270c8f31..a745d9f84 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -51,8 +51,6 @@ function wfinger_init(&$a) {
header('Access-Control-Allow-Origin: *');
- header('Content-type: application/jrd+json');
-
if($resource && $r) {
@@ -124,7 +122,6 @@ function wfinger_init(&$a) {
$arr = array('channel' => $r[0], 'request' => $_REQUEST, 'result' => $result);
call_hooks('webfinger',$arr);
- echo json_encode($arr['result']);
- killme();
+ json_return_and_die($arr['result'],'application/jrd+json');
-} \ No newline at end of file
+}