diff options
Diffstat (limited to 'inc/SimplePie.php')
| -rw-r--r-- | inc/SimplePie.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/inc/SimplePie.php b/inc/SimplePie.php index 887d56726..390b7e0a0 100644 --- a/inc/SimplePie.php +++ b/inc/SimplePie.php @@ -7681,9 +7681,10 @@ class SimplePie_Misc { if (function_exists('iconv')) { - return iconv('UTF-8', 'UTF-8//IGNORE', $str); + $out = iconv('UTF-8', 'UTF-8//IGNORE', $str); + if($out !== false) return $out; } - elseif (function_exists('mb_convert_encoding')) + if (function_exists('mb_convert_encoding')) { return mb_convert_encoding($str, 'UTF-8', 'UTF-8'); } @@ -10838,4 +10839,4 @@ class SimplePie_Sanitize } } -?>
\ No newline at end of file +?> |