public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:45:56 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
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
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
$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;
}