fix bug in previous patch, take two on closing #63

diff --git a/backend.php b/backend.php
index 066700dc572880b851770c7f58b6de7409ac25ad..9d4c694a49ecd3fe2c84a54b0ddf805953cca3d8 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -106,6 +106,12 @@
 
                setcookie('ttrss_vf_refresh', FEEDS_FRAME_REFRESH);
                setcookie('ttrss_vf_daemon', ENABLE_UPDATE_DAEMON);
+
+               if (get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED")) {             
+                       setcookie('ttrss_vf_catchupnext', 1);
+               } else {
+                       setcookie('ttrss_vf_catchupnext', 0);
+               }               
        }
 
        $fetch = $_GET["fetch"];

diff --git a/feedlist.js b/feedlist.js
index f1038d613916b3740647a91cfb202cb5d7a4f850..2bd5847974ad48987357a7e4626257f352563cef 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -116,7 +116,7 @@ function viewfeed(feed, skip, subop, doc, is_cat, subop_param) {
                        var next_unread_feed = getRelativeFeedId(feedlist,
                                        getActiveFeedId(), "next", true);
 
-                       if (next_unread_feed) {
+                       if (next_unread_feed && getCookie('ttrss_vf_catchupnext') == 1) {
                                query = query + "&nuf=" + param_escape(next_unread_feed);
                                setActiveFeedId(next_unread_feed);
                        }