From 99429e57e45c6bf2312243b57d64a56c8ccd7af2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 18:06:53 +0400
Subject: [PATCH] remove simplepie entity decode hacks
---
include/rssfuncs.php | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 21040e5a7..9148cc0e0 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;
- }
?>
--
GitLab