From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 13 Jul 2015 19:04:21 +0000 (+0300)
Subject: fix error feed (i.e. when requested feed no longer exists) not display properly
X-Git-Tag: 16.3~223
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=33c4bd89681f0065d50e5f862bf1a6732a04c49c;p=tt-rss.git

fix error feed (i.e. when requested feed no longer exists) not display properly
---

diff --git a/classes/feeds.php b/classes/feeds.php
index 1d106ea2..4effe3b7 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -991,7 +991,7 @@ class Feeds extends Handler_Protected {
 	private function generate_error_feed($error) {
 		$reply = array();
 
-		$reply['headlines']['id'] = -6;
+		$reply['headlines']['id'] = -7;
 		$reply['headlines']['is_cat'] = false;
 
 		$reply['headlines']['toolbar'] = '';
diff --git a/js/viewfeed.js b/js/viewfeed.js
index dff11556..56b15116 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -46,7 +46,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 				return;
 			}
 
-			if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+			if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
 				return;
 
 			/* dijit.getEnclosingWidget(