From af63bc308add17a186688cbd77acfe3ca639b0c7 Mon Sep 17 00:00:00 2001
From: "Mark A. Hershberger" <mah@users.mediawiki.org>
Date: Wed, 14 Jul 2010 17:34:18 +0000
Subject: [PATCH] * revert r61258 * check if iconv extension is loaded and, if
 so, use it in UtfNormal::cleanUp()

---
 includes/DjVuImage.php        | 8 +-------
 includes/normal/UtfNormal.php | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index f14d8d64cb..842b3a9e1b 100644
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -251,13 +251,7 @@ class DjVuImage {
 			wfProfileOut( 'djvutxt' );
 			if( $retval == 0) {
 				# Get rid of invalid UTF-8, strip control characters
-				if( is_callable( 'iconv' ) ) {
-					wfSuppressWarnings();
-					$txt = iconv( "UTF-8","UTF-8//IGNORE", $txt );
-					wfRestoreWarnings();
-				} else {
-					$txt = UtfNormal::cleanUp( $txt );
-				}
+				$txt = UtfNormal::cleanUp( $txt );
 				$txt = preg_replace( "/[\013\035\037]/", "", $txt );
 				$reg = <<<EOR
 					/\(page\s[\d-]*\s[\d-]*\s[\d-]*\s[\d-]*\s*"
diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php
index e1352fdbe0..c34641ba12 100644
--- a/includes/normal/UtfNormal.php
+++ b/includes/normal/UtfNormal.php
@@ -72,6 +72,13 @@ class UtfNormal {
 	 * @return string a clean, shiny, normalized UTF-8 string
 	 */
 	static function cleanUp( $string ) {
+		if( extension_loaded( 'iconv' ) ) {
+			wfSuppressWarnings();
+			$ret = iconv( "UTF-8","UTF-8//IGNORE", $string );
+			wfRestoreWarnings();
+			return $ret;
+		}
+
 		if( NORMALIZE_ICU ) {
 			# We exclude a few chars that ICU would not.
 			$string = preg_replace(
-- 
2.20.1