friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1192 from fabrixxm/api/jsonp 

add jsonp support to api
This commit is contained in:
Tobias Diekershoff 2014-10-17 14:54:26 +02:00
parent 295b4d7f61 9053417179
commit bb0b1918a1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/api.php
View File

@ -166,7 +166,10 @@
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");
@ -2292,12 +2295,10 @@
$recipient = $user_info;
$sender = api_get_user($a,normalise_link($item['contact-url']));
}
elseif ($box == "sentbox" || $item['from-url'] != $profile_url){
elseif ($box == "sentbox" || $item['from-url'] == $profile_url){
$recipient = api_get_user($a,normalise_link($item['contact-url']));
$sender = $user_info;
}
$ret[]=api_format_messages($item, $recipient, $sender);
}