Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

app/Controllers/configureController.php

@@ -114,7 +114,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 
 					if ($feedDAO->updateFeed ($id, $values)) {
 						$this->view->flux->_category ($cat);
-
+						$this->view->flux->faviconPrepare();
 						$notif = array (
 							'type' => 'good',
 							'content' => Minz_Translate::t ('feed_updated')

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);