GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'json_encode_fail_branch' into 'nightly' 

output error if json_encode fails



See merge request !86
This commit is contained in:
mmn 2016-01-26 21:16:24 +00:00
parent 42545c6625 4e50717e12
commit 52778e1882
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/apiaction.php
View File

@ -771,9 +771,15 @@ class ApiAction extends Action
function showJsonObjects($objects) function showJsonObjects($objects)
{ {
print(json_encode($objects)); $json_objects = json_encode($objects);
if($json_objects === false) {
$this->clientError(_('JSON encoding failed. Error: ').json_last_error_msg());
} else {
print $json_objects;
}
} }
function showSingleXmlStatus($notice) function showSingleXmlStatus($notice)
{ {
$this->initDocument('xml'); $this->initDocument('xml');
@ -1558,4 +1564,4 @@ class ApiAction extends Action
return $uri; return $uri;
} }
} }