From 00c6e040deec9c3998ab679dcb84fc46ae72d2ac Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Wed, 11 Sep 2013 20:31:58 +0200
Subject: removed google importer on the serverside, add importer for articles

---
 controller/feedcontroller.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'controller')

diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php
index 69b713914..762859627 100644
--- a/controller/feedcontroller.php
+++ b/controller/feedcontroller.php
@@ -227,18 +227,21 @@ class FeedController extends Controller {
 	 * @IsSubAdminExemption
 	 * @Ajax
 	 */
-	public function importGoogleReader() {
+	public function importArticles() {
 		$json = $this->params('json');
 		$userId = $this->api->getUserId();
 
-		$feed = $this->feedBusinessLayer->importGoogleReaderJSON($json, $userId);
+		$feed = $this->feedBusinessLayer->importArticles($json, $userId);
+
+		$params = array();
+		if($feed) {
+			$params['feeds'] = array($feed);
+		}
 
-		$params = array(
-			'feeds' => array($feed)
-		);
 		return $this->renderJSON($params);
 	}
 
+
 	/**
 	 * @IsAdminExemption
 	 * @IsSubAdminExemption
-- 
cgit v1.2.3