aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.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 /include/network.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 'include/network.php')
-rw-r--r--include/network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php
index aa6b54945..ecaf4e05f 100644
--- a/include/network.php
+++ b/include/network.php
@@ -294,8 +294,8 @@ function z_post_url_json($url, $params, $redirects = 0, $opts = array()) {
}
-function json_return_and_die($x) {
- header("content-type: application/json");
+function json_return_and_die($x, $content_type = 'application/json') {
+ header("Content-type: $content_type");
echo json_encode($x);
killme();
}