correction bug ajout flux + màj catégorie

3 files changed, 18 insertions, 18 deletions

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index e728ac3b0..f597c872f 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -8,10 +8,20 @@ class feedController extends ActionController {
 			try {
 				$feed = new Feed ($url);
 				$feed->load ();
-				$entries = $feed->entries ();
 				
-				$entryDAO = new EntryDAO ();
+				$feedDAO = new FeedDAO ();
+				$values = array (
+					'id' => $feed->id (),
+					'url' => $feed->url (),
+					'category' => null,
+					'name' => $feed->name (),
+					'website' => $feed->website (),
+					'description' => $feed->description (),
+				);
+				$feedDAO->addFeed ($values);
 				
+				$entryDAO = new EntryDAO ();
+				$entries = $feed->entries ();
 				foreach ($entries as $entry) {
 					$values = array (
 						'id' => $entry->id (),
@@ -27,17 +37,6 @@ class feedController extends ActionController {
 					);
 					$entryDAO->addEntry ($values);
 				}
-				
-				$feedDAO = new FeedDAO ();
-				$values = array (
-					'id' => $feed->id (),
-					'url' => $feed->url (),
-					'category' => $feed->category (),
-					'name' => $feed->name (),
-					'website' => $feed->website (),
-					'description' => $feed->description (),
-				);
-				$feedDAO->addFeed ($values);
 			} catch (Exception $e) {
 				// TODO ajouter une erreur : url non valide
 			}
diff --git a/app/models/Feed.php b/app/models/Feed.php
index cf1b3e06a..e1e8f6449 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -130,10 +130,10 @@ class FeedDAO extends Model_pdo {
 		$sql = 'UPDATE feed SET ' . $set . ' WHERE id=?';
 		$stm = $this->bd->prepare ($sql);
 
-		$values = array_merge (
-			$valuesTmp,
-			array ($id)
-		);
+		foreach ($valuesTmp as $v) {
+			$values[] = $v;
+		}
+		$values[] = $id;
 
 		if ($stm && $stm->execute ($values)) {
 			return true;
diff --git a/public/theme/base.css b/public/theme/base.css
index 58720a038..7be77c863 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -285,6 +285,7 @@ form {
 				margin: 20px 0;
 			}
 			.post.flux .content img {
+				margin: 10px;
 				border-radius: 5px;
 			}
 			.post.flux .content pre {
@@ -302,7 +303,7 @@ form {
 				margin: 10px 0;
 				padding: 0 20px;
 				font-style: italic;
-				border-left: 2px solid #ccc;
+				border-left: 4px solid #ccc;
 				color: #666;
 			}
 		.post.flux.not_read {