2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index b0fd4a8f9..243c155f9 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -61,6 +61,9 @@ class configureController extends ActionController {
 	}
 
 	public function feedAction () {
+		$catDAO = new CategoryDAO ();
+		$this->view->categories = $catDAO->listCategories ();
+
 		$feedDAO = new FeedDAO ();
 		$this->view->feeds = $feedDAO->listFeeds ();
 
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index 622adb96f..e16161842 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -15,10 +15,12 @@ class feedController extends ActionController {
 		} else {
 			if (Request::isPost ()) {
 				$url = Request::param ('url_rss');
+				$cat = Request::param ('category');
 				$params = array ();
 
 				try {
 					$feed = new Feed ($url);
+					$feed->_category ($cat);
 					$feed->load ();
 
 					$feedDAO = new FeedDAO ();