some searchbox focus workarouns, content hash checking is optional now

diff --git a/backend.php b/backend.php
index dd38641ac096fdf12355e771a1bbe89063067646..cfdc4be9c451784bd3fbfae44b05cd4de1300b0d 100644 (file)
--- 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 e301ef058d4bd46c38896762d1bcbe0ec1a738a1..b02e4c438a0bc3b7991cc6144ae3a4b2ed5bd772 100644 (file)
--- 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 46d010237942451874f386d552a3ab6fa488dd94..1374328bf0dc6da38ad99c0ce7c8027279ac43d9 100644 (file)
--- 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 58acf1d3000fb22c1308bc413bf89f41e021e122..99c539c2508f362ec797b1bd06545d0c3a274383 100644 (file)
--- 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