2 files changed, 16 insertions, 16 deletions

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 77893e547..3fbb20835 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -98,27 +98,27 @@ class feedController extends ActionController {
 		$date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old);
 
 		$i = 0;
-		try {
-			foreach ($feeds as $feed) {
+		foreach ($feeds as $feed) {
+			try {
 				$feed->load ();
-				$entries = $feed->entries ();
+			} catch (FeedException $e) {
+				Log::record ($e->getMessage (), Log::ERROR);
+			}
+			$entries = $feed->entries ();
 
-				foreach ($entries as $entry) {
-					if ($entry->date (true) >= $date_min) {
-						$values = $entry->toArray ();
-						$entryDAO->addEntry ($values);
-					}
+			foreach ($entries as $entry) {
+				if ($entry->date (true) >= $date_min) {
+					$values = $entry->toArray ();
+					$entryDAO->addEntry ($values);
 				}
+			}
 
-				$feedDAO->updateLastUpdate ($feed->id ());
+			$feedDAO->updateLastUpdate ($feed->id ());
 
-				$i++;
-				if ($i >= 10) {
-					break;
-				}
+			$i++;
+			if ($i >= 10) {
+				break;
 			}
-		} catch (FeedException $e) {
-			Log::record ($e->getMessage (), Log::ERROR);
 		}
 
 		$entryDAO->cleanOldEntries ($nb_month_old);
diff --git a/app/models/Feed.php b/app/models/Feed.php
index da75ae8c8..056cbf626 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -124,7 +124,7 @@ class Feed extends Model {
 				);
 			} else {
 				$feed = new SimplePie ();
-				$feed->set_feed_url ($this->url);
+				$feed->set_feed_url (preg_replace ('/&/', '&', $this->url));
 				$feed->set_cache_location (CACHE_PATH);
 				$feed->init ();