diff options
| -rwxr-xr-x | classes/rpc.php | 10 | ||||
| -rwxr-xr-x | classes/rssutils.php | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/classes/rpc.php b/classes/rpc.php index dbb98e9b7..73033bfec 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -436,7 +436,10 @@ class RPC extends Handler_Protected { ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) ) OR ttrss_feeds.last_updated IS NULL - OR last_updated = '1970-01-01 00:00:00')"; + OR ( + ttrss_feeds.update_interval > 0 + AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) + ))"; } else { $update_limit_qpart = "AND (( ttrss_feeds.update_interval = 0 @@ -445,7 +448,10 @@ class RPC extends Handler_Protected { ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) ) OR ttrss_feeds.last_updated IS NULL - OR last_updated = '1970-01-01 00:00:00')"; + OR ( + ttrss_feeds.update_interval > 0 + AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) + ))"; } // Test if feed is currently being updated by another process. diff --git a/classes/rssutils.php b/classes/rssutils.php index 8a554946c..78825c46d 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -57,8 +57,10 @@ class RSSUtils { ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL) ) OR (ttrss_feeds.last_updated IS NULL + AND ttrss_feeds.update_interval > 0 AND ttrss_user_prefs.value != '-1') OR (last_updated = '1970-01-01 00:00:00' + AND ttrss_feeds.update_interval > 0 AND ttrss_user_prefs.value != '-1'))"; } else { $update_limit_qpart = "AND (( @@ -69,8 +71,10 @@ class RSSUtils { ttrss_feeds.update_interval > 0 AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE) ) OR (ttrss_feeds.last_updated IS NULL + AND ttrss_feeds.update_interval > 0 AND ttrss_user_prefs.value != '-1') OR (last_updated = '1970-01-01 00:00:00' + AND ttrss_feeds.update_interval > 0 AND ttrss_user_prefs.value != '-1'))"; } |