Fix bug #1

3 files changed, 11 insertions, 2 deletions

diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 1450ce69e..eed8ccafa 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -14,7 +14,7 @@ class feedController extends ActionController {
 				try {
 					$feed = new Feed ($url);
 					$feed->load ();
-				
+					
 					$feedDAO = new FeedDAO ();
 					$values = array (
 						'id' => $feed->id (),
diff --git a/app/models/Feed.php b/app/models/Feed.php
index e28657612..8bc717a48 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -53,12 +53,21 @@ class Feed extends Model {
 		$this->category = $value;
 	}
 	public function _name ($value) {
+		if (is_null ($value)) {
+			$value = '';
+		}
 		$this->name = $value;
 	}
 	public function _website ($value) {
+		if (is_null ($value)) {
+			$value = '';
+		}
 		$this->website = $value;
 	}
 	public function _description ($value) {
+		if (is_null ($value)) {
+			$value = '';
+		}
 		$this->description = $value;
 	}
 	
diff --git a/public/data/Configuration.array.php b/public/data/Configuration.array.php
index 0d41392f1..57e1710c5 100644
--- a/public/data/Configuration.array.php
+++ b/public/data/Configuration.array.php
@@ -8,7 +8,7 @@ return array (
 	'shortcuts' => array (
 		'mark_read' => 'r',
 		'mark_favorite' => 'f',
-		'go_website' => 'enter',
+		'go_website' => 'space',
 		'next_entry' => 'page_down',
 		'prev_entry' => 'page_up',
 		'next_page' => 'right',