diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-10-07 21:48:06 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2016-10-07 21:48:06 +0200 |
| commit | b76d761a420d2b1ba2a86f1d919b3b0782d5eba9 (patch) | |
| tree | bbc8f21db70ae80c72f4d403ff86fc9932eec0bf /app/Controllers/feedController.php | |
| parent | a0d502a763c358bafbfa3bfe70c4dfc36181d5be (diff) | |
| parent | ca4dcca5b20c3e2e6da1293746cd46674d97c710 (diff) | |
Merge pull request #1291 from Alkarex/PSHB-bugs
PSHB bugs
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index dadc8aa83..8751d2fff 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -271,7 +271,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController { if ($ttl == -1) { continue; //Feed refresh is disabled } - if ($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl)) { + if ((!$simplePiePush) && (!$feed_id) && + ($feed->lastUpdate() + 10 >= time() - ($ttl == -2 ? FreshRSS_Context::$user_conf->ttl_default : $ttl))) { //Too early to refresh from source, but check whether the feed was updated by another user $mtime = $feed->cacheModifiedTime(); if ($feed->lastUpdate() + 10 >= $mtime) { |