Merge pull request #7459 from annando/notice
Fix a notice when setting a picture description via API
This commit is contained in:
commit
6c4fea5e6c
1 changed files with 6 additions and 4 deletions
|
@ -343,11 +343,13 @@ function api_call(App $a)
|
|||
break;
|
||||
case "json":
|
||||
header("Content-Type: application/json");
|
||||
if (!empty($return)) {
|
||||
$json = json_encode(end($return));
|
||||
if (!empty($_GET['callback'])) {
|
||||
$json = $_GET['callback'] . "(" . $json . ")";
|
||||
}
|
||||
$return = $json;
|
||||
}
|
||||
break;
|
||||
case "rss":
|
||||
header("Content-Type: application/rss+xml");
|
||||
|
|
Loading…
Reference in a new issue