summaryrefslogtreecommitdiff
path: root/app/Models
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-07-06 10:12:37 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-07-06 10:12:37 +0200
commit3d3b33ea2e3f00a3de154086341c1fc2abcadc3e (patch)
treed3c33ece2febe091eee5a9cbde5e3e702c215d37 /app/Models
parent72924cb5fecce336dce5b252f719a50af0981f12 (diff)
Bug global TTL
https://github.com/marienfressinaud/FreshRSS/issues/250
Diffstat (limited to 'app/Models')
-rw-r--r--app/Models/FeedDAO.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php
index 83f3a6231..756b1f008 100644
--- a/app/Models/FeedDAO.php
+++ b/app/Models/FeedDAO.php
@@ -223,6 +223,9 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
}
public function listFeedsOrderUpdate($defaultCacheDuration = 3600) {
+ if ($defaultCacheDuration < 0) {
+ $defaultCacheDuration = 2147483647;
+ }
$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history, ttl '
. 'FROM `' . $this->prefix . 'feed` '
. 'WHERE ttl <> -1 AND lastUpdate < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '