rework magpie encoding fix patch

1 files changed, 9 insertions, 2 deletions

diff --git a/magpierss/rss_parse.inc b/magpierss/rss_parse.inc
index 8a67523b5..0dfa5c7fb 100644
--- a/magpierss/rss_parse.inc
+++ b/magpierss/rss_parse.inc
@@ -141,11 +141,18 @@ class MagpieRSS {
 
 					xml_parser_free( $this->parser );
 
+					if (preg_match('/<\?xml.*?encoding="([^ ]+)".*?\?>/',
+								$source, $matches)) {
+
+						$enc = $matches[1];
+					} else {
+						$enc = mb_detect_encoding($string);
+					}
+
 					list($parser, $source) = $this->create_parser($source, 
 	                $output_encoding, $input_encoding, $detect_encoding);
 
-					$source = mb_convert_encoding($source, "UTF-8",
-						 mb_detect_encoding($source));
+					$source = mb_convert_encoding($source, "UTF-8", $enc);
 
 			      $this->parser = $parser;