summaryrefslogtreecommitdiff
path: root/lib/SimplePie/SimplePie.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-02-16 21:34:30 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-02-16 21:34:30 +0100
commit7e66db7782b7fa7f7262a70ccea5c377341886cd (patch)
treef2d29f228971adc3dad143465f651e76e2f34184 /lib/SimplePie/SimplePie.php
parent82043127bf9c3ff88bf3d48cab76cea27d052b0a (diff)
SimplePie : tolérance caractères UTF-8 invalides
Meilleure implémentation de https://github.com/marienfressinaud/FreshRSS/commit/f5251384c40fbf16c2b7f448884d7583b0119e7a pour corriger https://github.com/marienfressinaud/FreshRSS/issues/419 Revert partiel de https://github.com/marienfressinaud/FreshRSS/commit/316778ef47394b27047abd9c9a739c34d2fd3829#diff-d8be58dcfea709da6131af81563c5c9fR1350
Diffstat (limited to 'lib/SimplePie/SimplePie.php')
-rw-r--r--lib/SimplePie/SimplePie.php3
1 files changed, 1 insertions, 2 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');