revert to previous catchup behaviour on reverse headlines mode; fix typo in js

diff --git a/include/functions.php b/include/functions.php
index 346396ed66be88ddab16f92c5b100572c63eed59..918192cd37ccddcfbb67c450d1fe222f2af970c8 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1326,7 +1326,8 @@
 
                        //if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
 
-                       $ref_check_qpart = ($max_id) ? "ref_id <= '$max_id'" : "true";
+                       $ref_check_qpart = ($max_id &&
+                               !get_pref($link, 'REVERSE_HEADLINES')) ? "ref_id <= '$max_id'" : "true";
 
                        if (is_numeric($feed)) {
                                if ($cat_view) {

diff --git a/js/feedlist.js b/js/feedlist.js
index 4341a5d80cf0c95a194c51a1426a0e84c82bc503..21fe9c50c8e5214bee252be2791e9b46bc0ce879 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -493,7 +493,7 @@ function catchupFeed(feed, is_cat) {
 
                var max_id = 0;
 
-               if (feed = getActiveFeedId() && is_cat == activeFeedIsCat()) {
+               if (feed == getActiveFeedId() && is_cat == activeFeedIsCat()) {
                        $$("#headlines-frame > div[id*=RROW]").each(
                                function(child) {
                                        var id = parseInt(child.id.replace("RROW-", ""));