From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 3 Jun 2012 18:42:42 +0000 (+0400)
Subject: revert to previous catchup behaviour on reverse headlines mode; fix typo in js
X-Git-Tag: 1.6.0~221
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=705b97b7fca9ea70820af5fcd926f88903eaa430;p=tt-rss.git

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

diff --git a/include/functions.php b/include/functions.php
index 346396ed..918192cd 100644
--- 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 4341a5d8..21fe9c50 100644
--- 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-", ""));