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 1d106ea2e069da6ff52b5498fe38cbc51d47b4b1..4effe3b7018fc832bd814eefe750cfe164373a22 100644 (file)
--- 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 dff11556a14db70c16f40128f299ca6729f37ce8..56b15116fd6fb74a80d38686eb52bc0641c83f43 100644 (file)
--- 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(