mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-27 12:07:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug global TTL

Browse Source 
https://github.com/marienfressinaud/FreshRSS/issues/250
This commit is contained in:
Alexandre Alapetite
2014-07-06 10:12:37 +02:00
parent 72924cb5fe
commit 3d3b33ea2e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/FeedDAO.php
View File

@@ -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)) '

2
app/views/configure/archiving.phtml
View File

@@ -25,7 +25,7 @@
</div>
</div>
<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">
<select class="number" name="ttl_default" id="ttl_default" required="required"><?php
$found = false;