Commit 215c9f0f authored by Andrew Dolgov's avatar Andrew Dolgov

fail better if Feeds.view() data failed encoding to JSON

parent eedd4028
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment