valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2015-07-13 22:04:21 +03:00
parent f17069960c
commit 33c4bd8968
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -991,7 +991,7 @@ class Feeds extends Handler_Protected {
private function generate_error_feed($error) { private function generate_error_feed($error) {
$reply = array(); $reply = array();
$reply['headlines']['id'] = -6; $reply['headlines']['id'] = -7;
$reply['headlines']['is_cat'] = false; $reply['headlines']['is_cat'] = false;
$reply['headlines']['toolbar'] = ''; $reply['headlines']['toolbar'] = '';

2
js/viewfeed.js
View File

@ -46,7 +46,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
return; return;
} }
if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()) if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
return; return;
/* dijit.getEnclosingWidget( /* dijit.getEnclosingWidget(