Merge branch 'htmlencoding' of https://github.com/Alkarex/FreshRSS into Alkarex-htmlencoding

Conflicts:
	app/models/Feed.php

1 files changed, 1 insertions, 3 deletions

diff --git a/app/models/Feed.php b/app/models/Feed.php
index 0ea083d5a..1b380136e 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -214,9 +214,7 @@ class Feed extends Model {
 		$entries = array ();
 
 		foreach ($feed->get_items () as $item) {
-			$title = $item->get_title ();
-			$title = preg_replace('#<a(.+)>(.+)</a>#', '\\2', $title);
-			$title = htmlentities($title, ENT_NOQUOTES, 'UTF-8');
+			$title = strip_tags($item->get_title ());
 			$author = $item->get_author ();
 			$link = $item->get_permalink ();
 			$date = strtotime ($item->get_date ());