From: all <all@hoover>
Date: Sat, 30 Mar 2013 08:43:37 +0000 (+0100)
Subject: Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set to -1... 
X-Git-Tag: 1.7.6~141^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bca1cfbb9580d3ed295f7d93bbf4dce00eae8456;p=tt-rss.git

Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set to -1 (no update)
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e82e94b0..fcf89746 100644
--- 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