diff options
| author | 2014-02-11 23:18:26 +0100 | |
|---|---|---|
| committer | 2014-02-11 23:18:26 +0100 | |
| commit | 483513c30ff2aa3a445d3a9e788332d7ce703d2b (patch) | |
| tree | 15fde4abd8580ccdc5f8f44655ec7b8a98f3e29d /app/Controllers/feedController.php | |
| parent | 6f693afe99fdd236484e157ee491c0a6c92a8219 (diff) | |
| parent | 11c4c733d6971a977748f874b4976044bab7afc0 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app/Controllers/feedController.php')
| -rwxr-xr-x | app/Controllers/feedController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 61bfc5919..d98c77558 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -249,12 +249,12 @@ class FreshRSS_feed_Controller extends Minz_ActionController { if ($feed->url() !== $url) { //URL has changed (auto-discovery) $feedDAO->updateFeed($feed->id(), array('url' => $feed->url())); } - $feed->faviconPrepare(); } catch (FreshRSS_Feed_Exception $e) { Minz_Log::record ($e->getMessage (), Minz_Log::NOTICE); $feedDAO->updateLastUpdate ($feed->id (), 1); } + $feed->faviconPrepare(); $feed->unlock(); unset($feed); |
