From: Andrew Dolgov Date: Sat, 30 Mar 2013 09:26:15 +0000 (+0400) Subject: Revert "Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set... X-Git-Tag: 1.7.6~139 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7b11aa80ab83a679de5b032859a5bf40dd05acc8;p=tt-rss.git Revert "Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set to -1 (no update)" This reverts commit bca1cfbb9580d3ed295f7d93bbf4dce00eae8456. --- diff --git a/include/rssfuncs.php b/include/rssfuncs.php index fcf89746..e82e94b0 100644 --- a/include/rssfuncs.php +++ b/include/rssfuncs.php @@ -77,7 +77,6 @@ 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 @@ -87,7 +86,6 @@ } 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