diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-02-11 21:26:09 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-02-11 21:26:09 +0100 |
| commit | d48f612c437009069593978fe43833fe2c7d74ea (patch) | |
| tree | acd0323ac29c758171a859abcb05f80ac0e2baa6 /app/Controllers/feedController.php | |
| parent | a6b7243b1634b50bdf9852045e2b31133864b4f8 (diff) | |
Bug variable $feed utilisée en dehors de la boucle foreach
https://github.com/marienfressinaud/FreshRSS/issues/415
https://github.com/marienfressinaud/FreshRSS/issues/420
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index ddbb62e24..55e8f76cf 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -246,12 +246,13 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $feedDAO->updateFeed($feed->id(), array('url' => $feed->url())); } $feed->faviconPrepare(); - unset($feed); } catch (FreshRSS_Feed_Exception $e) { Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE); $feedDAO->updateLastUpdate ($feed->id (), 1); } + unset($feed); + // On arrête à 10 flux pour ne pas surcharger le serveur // sauf si le paramètre $force est à vrai $i++; @@ -263,6 +264,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController { $url = array (); if ($flux_update === 1) { // on a mis un seul flux à jour + $feed = reset ($feeds); $notif = array ( 'type' => 'good', 'content' => Minz_Translate::t ('feed_actualized', $feed->name ()) |