valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2018-12-24 12:28:11 +03:00
parent eedd402807
commit 215c9f0f88
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/feeds.php
View File

@ -563,7 +563,14 @@ class Feeds extends Handler_Protected {
// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc // this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
$reply['runtime-info'] = make_runtime_info(); $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;
} }

2
errors.php
View File

@ -38,6 +38,8 @@
$ERRORS[14] = __("Plugin not found"); $ERRORS[14] = __("Plugin not found");
$ERRORS[15] = __("Encoding data as JSON failed");
if ($_REQUEST['mode'] == 'js') { if ($_REQUEST['mode'] == 'js') {
header("Content-Type: text/javascript; charset=UTF-8"); header("Content-Type: text/javascript; charset=UTF-8");