diff options
| -rwxr-xr-x | classes/rpc.php | 8 | ||||
| -rwxr-xr-x | classes/rssutils.php | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/classes/rpc.php b/classes/rpc.php index 016a3bd03..ce580c8ca 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -248,27 +248,27 @@ class RPC extends Handler_Protected { if (Config::get(Config::DB_TYPE) == "pgsql") { $update_limit_qpart = "AND (( update_interval = 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL) ) OR ( update_interval > 0 AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL) ) OR ( update_interval >= 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) ))"; } else { $update_limit_qpart = "AND (( update_interval = 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE) ) OR ( update_interval > 0 AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE) ) OR ( update_interval >= 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) ))"; } diff --git a/classes/rssutils.php b/classes/rssutils.php index 11a94162c..62f8d9687 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -78,27 +78,27 @@ class RSSUtils { if (Config::get(Config::DB_TYPE) == "pgsql") { $update_limit_qpart = "AND (( update_interval = 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND last_updated < NOW() - CAST((COALESCE(p.value, '$default_interval') || ' minutes') AS INTERVAL) ) OR ( update_interval > 0 AND last_updated < NOW() - CAST((update_interval || ' minutes') AS INTERVAL) ) OR ( update_interval >= 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) ))"; } else { $update_limit_qpart = "AND (( update_interval = 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(COALESCE(p.value, '$default_interval'), SIGNED INTEGER) MINUTE) ) OR ( update_interval > 0 AND last_updated < DATE_SUB(NOW(), INTERVAL update_interval MINUTE) ) OR ( update_interval >= 0 - AND p.value != '-1' + AND (p.value IS NULL OR p.value != '-1') AND (last_updated = '1970-01-01 00:00:00' OR last_updated IS NULL) ))"; } |