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

1 files changed, 8 insertions, 1 deletions

diff --git a/classes/feeds.php b/classes/feeds.php
index 38819ec77..489ffd3c4 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -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;
 
 	}