aboutsummaryrefslogtreecommitdiff
path: root/lib/SimplePie
diff options
context:
space:
mode:
authorGravatar Alkarex <alexandre@alapetite.fr> 2014-02-11 15:05:11 +0100
committerGravatar Alkarex <alexandre@alapetite.fr> 2014-02-11 15:05:11 +0100
commitf5251384c40fbf16c2b7f448884d7583b0119e7a (patch)
treee39db671e9e1a1d8395ac25c11625033ceb456a9 /lib/SimplePie
parent7fa620cce54f7fd187c477df080ebed33c818b07 (diff)
Tolère certaines séquences UTF-8 invalides
Corrige https://github.com/marienfressinaud/FreshRSS/issues/419 À re-tester sur d'autres flux
Diffstat (limited to 'lib/SimplePie')
-rw-r--r--lib/SimplePie/SimplePie/Parser.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/SimplePie/SimplePie/Parser.php b/lib/SimplePie/SimplePie/Parser.php
index bd6c4efd8..57e1db16c 100644
--- a/lib/SimplePie/SimplePie/Parser.php
+++ b/lib/SimplePie/SimplePie/Parser.php
@@ -145,10 +145,15 @@ 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;
}
+ unset($data2);
}
catch (Exception $e)
{