fail better if Feeds.view() data failed encoding to JSON
This commit is contained in:
parent
eedd402807
commit
215c9f0f88
|
@ -563,7 +563,14 @@ class Feeds extends Handler_Protected {
|
|||
// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
|
||||
$reply['runtime-info'] = make_runtime_info();
|
||||
|
||||
print json_encode($reply);
|
||||
$reply_json = json_encode($reply);
|
||||
|
||||
if (!$reply_json) {
|
||||
$reply_json = json_encode(["error" => ["code" => 15,
|
||||
"message" => json_last_error_msg()]]);
|
||||
}
|
||||
|
||||
print $reply_json;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -38,6 +38,8 @@
|
|||
|
||||
$ERRORS[14] = __("Plugin not found");
|
||||
|
||||
$ERRORS[15] = __("Encoding data as JSON failed");
|
||||
|
||||
if ($_REQUEST['mode'] == 'js') {
|
||||
header("Content-Type: text/javascript; charset=UTF-8");
|
||||
|
||||
|
|
Loading…
Reference in New Issue