diff options
| -rw-r--r-- | lib/SimplePie/SimplePie.php | 3 | ||||
| -rw-r--r-- | lib/SimplePie/SimplePie/Parser.php | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/SimplePie/SimplePie.php b/lib/SimplePie/SimplePie.php index a23b2b830..673855cb2 100644 --- a/lib/SimplePie/SimplePie.php +++ b/lib/SimplePie/SimplePie.php @@ -1372,8 +1372,7 @@ class SimplePie foreach ($encodings as $encoding) { // Change the encoding to UTF-8 (as we always use UTF-8 internally) - if ($utf8_data = (empty($encoding) || $encoding === 'UTF-8') ? $this->raw_data : //FreshRSS - $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8'))) + if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8'))) { // Create new parser $parser = $this->registry->create('Parser'); diff --git a/lib/SimplePie/SimplePie/Parser.php b/lib/SimplePie/SimplePie/Parser.php index 57e1db16c..ff7ff26d8 100644 --- a/lib/SimplePie/SimplePie/Parser.php +++ b/lib/SimplePie/SimplePie/Parser.php @@ -145,10 +145,6 @@ class SimplePie_Parser $dom->loadXML($data); $this->encoding = $encoding = $dom->encoding = 'UTF-8'; $data2 = $dom->saveXML(); - if (function_exists('mb_convert_encoding')) - { - $data2 = mb_convert_encoding($data2, 'UTF-8', 'UTF-8'); - } if (strlen($data2) > (strlen($data) / 2.0)) { $data = $data2; |