diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-30 02:04:33 -0700 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-30 02:04:33 -0700 |
| commit | 54838d87b7a143c173b6edd6963c6010688ea61b (patch) | |
| tree | 15b704b1f7305d8a9a107ef638b517782877ec97 | |
| parent | 05e62b6726e7d171de5664aee65afb575a9a9ba3 (diff) | |
| parent | bca1cfbb9580d3ed295f7d93bbf4dce00eae8456 (diff) | |
Merge pull request #103 from yanobs/master
Avoid updating feed based on user pref DEFAULT_UPDATE_INTERVAL if it is set to -1 (no update)
| -rw-r--r-- | include/rssfuncs.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rssfuncs.php b/include/rssfuncs.php index e82e94b09..fcf897461 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 |