Kaynağa Gözat

Bug global TTL

https://github.com/marienfressinaud/FreshRSS/issues/250
Alexandre Alapetite 11 yıl önce
ebeveyn
işleme
3d3b33ea2e

+ 3 - 0
app/Models/FeedDAO.php

@@ -223,6 +223,9 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
 	}
 	}
 
 
 	public function listFeedsOrderUpdate($defaultCacheDuration = 3600) {
 	public function listFeedsOrderUpdate($defaultCacheDuration = 3600) {
+		if ($defaultCacheDuration < 0) {
+			$defaultCacheDuration = 2147483647;
+		}
 		$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history, ttl '
 		$sql = 'SELECT id, url, name, website, lastUpdate, pathEntries, httpAuth, keep_history, ttl '
 		     . 'FROM `' . $this->prefix . 'feed` '
 		     . 'FROM `' . $this->prefix . 'feed` '
 		     . 'WHERE ttl <> -1 AND lastUpdate < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '
 		     . 'WHERE ttl <> -1 AND lastUpdate < (' . (time() + 60) . '-(CASE WHEN ttl=-2 THEN ' . intval($defaultCacheDuration) . ' ELSE ttl END)) '

+ 1 - 1
app/views/configure/archiving.phtml

@@ -25,7 +25,7 @@
 			</div>
 			</div>
 		</div>
 		</div>
 		<div class="form-group">
 		<div class="form-group">
-			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'), ' ', Minz_Translate::t('by_feed'); ?></label>
+			<label class="group-name" for="ttl_default"><?php echo Minz_Translate::t('ttl'); ?></label>
 			<div class="group-controls">
 			<div class="group-controls">
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 				<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
 					$found = false;
 					$found = false;