StandaloneLinkHandler.php: Use iconv for encoding conversion

Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>
CurbSafeCharmer · Apr 5, 2015 · 3168e71 · 3168e71
1 parent 29b8636
commit 3168e71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
 		"php": ">=5.3.0",
 		"ext-curl": "*",
 		"ext-mbstring": "*",
+		"ext-iconv": "*",
 		"jeremykendall/php-domain-parser": "~1.3",
 		"masterminds/html5": "2.*",
 		"twig/twig": "~1.0"

diff --git a/src/Reflinks/LinkHandlers/StandaloneLinkHandler.php b/src/Reflinks/LinkHandlers/StandaloneLinkHandler.php
@@ -77,7 +77,10 @@ public function getMetadata( $url, Metadata $baseMetadata = null ) {
 			$encoding = "UTF-8";
 		}
 		if ( $encoding != "UTF-8" ) {
-			$utf8Html = mb_convert_encoding( $response->html, "UTF-8", $encoding );
+			$utf8Html = iconv( $encoding, "UTF-8", $response->html );
+			if ( false === $utf8Html ) {
+				$utf8Html = $response->html;
+			}
 		} else {
 			$utf8Html = $response->html;
 		}