importing opml becomes simple for debugging reasons (ignore SimplePie issues for now)

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/feedmapper.php b/lib/feedmapper.php
index a533691cb..c5f01f8d2 100644
--- a/lib/feedmapper.php
+++ b/lib/feedmapper.php
@@ -63,7 +63,7 @@ class OC_News_FeedMapper {
 			return null;
 
 		$url = $row['url'];
-		$title = $row['title'];
+		$title = htmlspecialchars_decode($row['title']);
 		$feed = new OC_News_Feed($url, $title, null, $id);
 		return $feed;
 	}
@@ -79,7 +79,7 @@ class OC_News_FeedMapper {
 		$feeds = array();
 		while ($row = $result->fetchRow()) {
 			$url = $row['url'];
-			$title = $row['title'];
+			$title = htmlspecialchars_decode($row['title']);
 			$id = $row['id'];
 			$feed = new OC_News_Feed($url, $title, null, $id);
 			$favicon = $row['favicon_link'];
@@ -100,7 +100,7 @@ class OC_News_FeedMapper {
 		$result = $stmt->execute(array($id));
 		$row = $result->fetchRow();
 		$url = $row['url'];
-		$title = $row['title'];
+		$title = htmlspecialchars_decode($row['title']);
 		$feed = new OC_News_Feed($url, $title, null,$id);
 		$favicon = $row['favicon_link'];
 		$feed->setFavicon($favicon);
@@ -175,7 +175,7 @@ class OC_News_FeedMapper {
 
 			$params=array(
 				$url,
-				htmlspecialchars_decode($title),
+				$title,
 				$feed->getFavicon(),
 				$folderid,
 				$this->userid
diff --git a/lib/itemmapper.php b/lib/itemmapper.php
index b20387192..27f56eb3f 100644
--- a/lib/itemmapper.php
+++ b/lib/itemmapper.php
@@ -126,7 +126,7 @@ class OC_News_ItemMapper {
 				htmlspecialchars_decode($item->getUrl()),
 				htmlspecialchars_decode($title),
 				$body,
-				$guid,
+				htmlspecialchars_decode($guid),
 				$feedid,
 				$status
 			);
diff --git a/lib/utils.php b/lib/utils.php
index b7750e71a..f98608cd4 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -37,7 +37,7 @@ class OC_News_Utils {
 
 		$items = array();
 		if ($spitems = $spfeed->get_items()) {
-			foreach($spitems as $spitem) { //FIXME: maybe we can avoid this loop
+			foreach($spitems as $spitem) {
 				$itemUrl = $spitem->get_permalink();
 				$itemTitle = $spitem->get_title();
 				$itemGUID = $spitem->get_id();