From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 25 Aug 2005 14:12:10 +0000 (+0100)
Subject: some searchbox focus workarouns, content hash checking is optional now
X-Git-Tag: 20050826-1~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=36bf74967c6a6a310a03f2fe30299c8f6bc34124;p=tt-rss.git

some searchbox focus workarouns, content hash checking is optional now
---

diff --git a/backend.php b/backend.php
index dd38641a..cfdc4be9 100644
--- a/backend.php
+++ b/backend.php
@@ -261,7 +261,9 @@
 		}
 
 		$result = pg_query("SELECT count(id) AS total_entries 
-			FROM ttrss_entries WHERE feed_id = '$feed'");
+			FROM ttrss_entries WHERE 
+			$search_query_part
+			feed_id = '$feed'");
 
 		$total_entries = pg_fetch_result($result, 0, "total_entries");
 
diff --git a/config.php-dist b/config.php-dist
index e301ef05..b02e4c43 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -8,5 +8,6 @@
 	define(ICONS_DIR, "icons");
 	define(ICONS_URL, "icons");
 	define(PURGE_OLD_DAYS, 30);
+	define(UPDATE_POST_ON_CHECKSUM_CHANGE, true);
 ?>
 
diff --git a/functions.php b/functions.php
index 46d01023..1374328b 100644
--- a/functions.php
+++ b/functions.php
@@ -195,8 +195,10 @@
 					if ($orig_title != $entry_title) {
 						$last_read_qpart = 'last_read = null,';
 					}
+					
+					if (UPDATE_POST_ON_CHECKSUM_CHANGE && 
+							$orig_content_hash != $content_hash) {
 
-					if ($orig_content_hash != $content_hash) {
 						$last_read_qpart = 'last_read = null,';
 					}
 
diff --git a/tt-rss.js b/tt-rss.js
index 58acf1d3..99c539c2 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -244,6 +244,8 @@ function catchupAllFeeds() {
 
 function viewfeed(feed, skip, subop) {
 
+	enableHotkeys();
+
 	var searchbox = document.getElementById("searchbox");
 
 	if (searchbox) {
@@ -298,6 +300,8 @@ function cleanSelectedHeadlines() {
 
 function view(id,feed_id) {
 
+	enableHotkeys();
+
 	if (xmlhttp_view.readyState != 4 && xmlhttp_view.readyState != 0) {
 		printLockingError();
 		return