aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-03-25 10:34:46 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-03-25 10:34:46 +0200
commit16d4d5185ed653c7f4b2dadf7a143eecc42352a0 (patch)
treeb62a4e5130505ee04fc226f5a0099fe0b4f2e238 /app/Controllers/feedController.php
parentb2c02f50c1c50dda71e0e93d638b88865db9cb2b (diff)
Fix mute feeds
https://github.com/FreshRSS/FreshRSS/issues/1844
Diffstat (limited to 'app/Controllers/feedController.php')
-rwxr-xr-xapp/Controllers/feedController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index af732951f..59c22b777 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -284,10 +284,10 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
}
$mtime = 0;
- $ttl = $feed->ttl();
- if ($ttl < FreshRSS_Feed::TTL_DEFAULT) {
+ if ($feed->mute()) {
continue; //Feed refresh is disabled
}
+ $ttl = $feed->ttl();
if ((!$simplePiePush) && (!$feed_id) &&
($feed->lastUpdate() + 10 >= time() - ($ttl == FreshRSS_Feed::TTL_DEFAULT ? FreshRSS_Context::$user_conf->ttl_default : $ttl))) {
//Too early to refresh from source, but check whether the feed was updated by another user