summaryrefslogtreecommitdiff
path: root/classes/rpc.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2020-09-17 15:40:50 +0300
committerAndrew Dolgov <[email protected]>2020-09-17 15:40:50 +0300
commitafa0023c518b3ee90e3f95de834cab9bafa4f872 (patch)
tree0b9053c4259d69b4b3dd72fba2b15c26a522408d /classes/rpc.php
parentf41fdef38982f0acc895f312f58d14704a8a9f0f (diff)
don't try to update manually disabled feeds even if they haven't been updated before or are marked for a manual update
Diffstat (limited to 'classes/rpc.php')
-rwxr-xr-xclasses/rpc.php10
1 files changed, 8 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.