Catch FeedException lors de l'actualisation

2 files changed, 18 insertions, 14 deletions

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index c205801af..77893e547 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -98,23 +98,27 @@ class feedController extends ActionController {
 		$date_min = time () - (60 * 60 * 24 * 30 * $nb_month_old);
 
 		$i = 0;
-		foreach ($feeds as $feed) {
-			$feed->load ();
-			$entries = $feed->entries ();
-
-			foreach ($entries as $entry) {
-				if ($entry->date (true) >= $date_min) {
-					$values = $entry->toArray ();
-					$entryDAO->addEntry ($values);
+		try {
+			foreach ($feeds as $feed) {
+				$feed->load ();
+				$entries = $feed->entries ();
+
+				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/public/theme/base.css b/public/theme/base.css
index 7e2ce0520..98d387150 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -693,7 +693,7 @@ input, select, textarea {
 					width: 30px;
 					height: 40px;
 					vertical-align: middle;
-					line-height: 35px;
+					line-height: 40px;
 					font-size: 12px;
 				}
 			.flux_header .item.website {