From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 14:06:53 +0000 (+0400)
Subject: remove simplepie entity decode hacks
X-Git-Tag: 1.7.9~25^2~44
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=99429e57e45c6bf2312243b57d64a56c8ccd7af2;p=tt-rss.git

remove simplepie entity decode hacks
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 21040e5a..9148cc0e 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -563,8 +563,9 @@
 
 				_debug("date $entry_timestamp [$entry_timestamp_fmt]", $debug_enabled);
 
-				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
-				$entry_title = decode_numeric_entities($entry_title);
+//				$entry_title = html_entity_decode($item->get_title(), ENT_COMPAT, 'UTF-8');
+//				$entry_title = decode_numeric_entities($entry_title);
+				$entry_title = $item->get_title();
 
 				$entry_link = rewrite_relative_url($site_url, $item->get_link());
 
@@ -1395,15 +1396,4 @@
 
 		_debug("Cleaned $rc cached tags.");
 	}
-
-	function utf8_entity_decode($entity){
-		$convmap = array(0x0, 0x10000, 0, 0xfffff);
-		return mb_decode_numericentity($entity, $convmap, 'UTF-8');
-	}
-
-	function decode_numeric_entities($body) {
-		$body = preg_replace('/&#\d{2,5};/ue', "utf8_entity_decode('$0')", $body );
-		$body = preg_replace('/&#x([a-fA-F0-7]{2,8});/ue', "utf8_entity_decode('&#'.hexdec('$1').';')", $body );
-		return $body;
-	}
 ?>