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

output error if json_encode fails

Browse Source
This commit is contained in:
hannes 2016-01-23 15:01:27 +00:00
parent 81f9a59f25
commit 4e50717e12
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/apiaction.php
View File

@ -771,8 +771,14 @@ 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)
{ {