Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set to -1...

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e82e94b099f1d99ed665df7acd27a3c0e94a1e73..fcf89746111a35bbee6dde85a6124086b552b337 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -77,6 +77,7 @@
                if (DB_TYPE == "pgsql") {
                        $update_limit_qpart = "AND ((
                                        ttrss_feeds.update_interval = 0
+                                       AND ttrss_user_prefs.value > 0
                                        AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
                                ) OR (
                                        ttrss_feeds.update_interval > 0
@@ -86,6 +87,7 @@
                } else {
                        $update_limit_qpart = "AND ((
                                        ttrss_feeds.update_interval = 0
+                                       AND ttrss_user_prefs.value > 0
                                        AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
                                ) OR (
                                        ttrss_feeds.update_interval > 0