harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsonp support (thankxs fabrixxm)

Browse Source
This commit is contained in:
friendica 2014-10-16 02:02:11 -07:00
parent d4abc91d1f
commit e1f88fd15d
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/api.php
View File

@ -197,7 +197,10 @@ require_once('include/items.php');
case "json": case "json":
header ("Content-Type: application/json"); header ("Content-Type: application/json");
foreach($r as $rr) foreach($r as $rr)
return json_encode($rr); $json = json_encode($rr);
if ($_GET['callback'])
$json = $_GET['callback']."(".$json.")";
return $json;
break; break;
case "rss": case "rss":
header ("Content-Type: application/rss+xml"); header ("Content-Type: application/rss+xml");

2
include/taxonomy.php
View File

@ -154,7 +154,7 @@ function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $restrict = 0, $
} }
function tags_sort($a,$b) { function tags_sort($a,$b) {
if($a[0] == $b[0]) if(strtolower($a[0]) == strtolower($b[0]))
return 0; return 0;
return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1); return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
} }

2
version.inc
View File

@ -1 +1 @@
2014-10-15.829 2014-10-16.830