aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-16 02:02:11 -0700
committerfriendica <info@friendica.com>2014-10-16 02:02:11 -0700
commite1f88fd15d75f81af5017860b9f197771326c9b7 (patch)
tree5484d212498eea4ab0e98e531dc06d5623cb8364 /include/api.php
parentd4abc91d1ffad2784837e1446beef1223f98f19a (diff)
downloadvolse-hubzilla-e1f88fd15d75f81af5017860b9f197771326c9b7.tar.gz
volse-hubzilla-e1f88fd15d75f81af5017860b9f197771326c9b7.tar.bz2
volse-hubzilla-e1f88fd15d75f81af5017860b9f197771326c9b7.zip
jsonp support (thankxs fabrixxm)
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php
index 2505def4c..8b52253dd 100644
--- a/include/api.php
+++ b/include/api.php
@@ -197,7 +197,10 @@ require_once('include/items.php');
case "json":
header ("Content-Type: application/json");
foreach($r as $rr)
- return json_encode($rr);
+ $json = json_encode($rr);
+ if ($_GET['callback'])
+ $json = $_GET['callback']."(".$json.")";
+ return $json;
break;
case "rss":
header ("Content-Type: application/rss+xml");