mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 16:25:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "SimplePie : tolérance caractères UTF-8 invalides"

Browse Source 
This reverts commit 7e66db7782.
This commit is contained in:
Alexandre Alapetite
2014-02-17 00:15:42 +01:00
parent 0d387081df
commit d51048196b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/SimplePie/SimplePie.php
View File

@@ -1382,7 +1382,8 @@ class SimplePie
foreach ($encodings as $encoding)
{
// Change the encoding to UTF-8 (as we always use UTF-8 internally)
if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8')))
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')))
{
// Create new parser
$parser = $this->registry->create('Parser');

4
lib/SimplePie/SimplePie/Parser.php
View File

@@ -145,6 +145,10 @@ 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;