diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2007-08-10 01:43:20 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2007-08-10 01:43:20 +0200 |
| commit | d4db9fb915e13c43b0a929c5203d4f086715bee1 (patch) | |
| tree | 2d602b22b395788964d69d96f1ab593135c2e4db /inc/SimplePie.php | |
| parent | f121c6d2be273a92ff2ca56d002c4d875df4372f (diff) | |
| download | rpg-d4db9fb915e13c43b0a929c5203d4f086715bee1.tar.gz rpg-d4db9fb915e13c43b0a929c5203d4f086715bee1.tar.bz2 | |
Fix for not working iconv call in SimplePie
See http://simplepie.org/support/viewtopic.php?pid819#p3819
Patch sent to upstream
darcs-hash:20070809234320-7ad00-985fc7e26ee6440efef8a4c8b72d313df012fc53.gz
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 +?> |