diff options
| author | Andrew Dolgov <[email protected]> | 2015-07-13 22:04:21 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-07-13 22:04:21 +0300 |
| commit | 33c4bd89681f0065d50e5f862bf1a6732a04c49c (patch) | |
| tree | 4a9295165e430e0ff8a41d1797ded0528400b2db | |
| parent | f17069960c852237ca0ee25fb677cf7061c13599 (diff) | |
fix error feed (i.e. when requested feed no longer exists) not display properly
| -rw-r--r-- | classes/feeds.php | 2 | ||||
| -rw-r--r-- | js/viewfeed.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 1d106ea2e..4effe3b70 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 dff11556a..56b15116f 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( |