From 104444bbb55c63d1519ba977292a9247407329b6 Mon Sep 17 00:00:00 2001
From: "Mark A. Hershberger" <mah@users.mediawiki.org>
Date: Tue, 20 Jul 2010 16:14:09 +0000
Subject: [PATCH] =?utf8?q?fixes=20r69333=20=E2=80=94=20remove=20dependency?=
 =?utf8?q?=20on=20iconv,=20use=20icu=20or=20native=20only?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 includes/normal/UtfNormal.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php
index 621ef9de4b..0ae47f2070 100644
--- a/includes/normal/UtfNormal.php
+++ b/includes/normal/UtfNormal.php
@@ -73,13 +73,6 @@ 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 || NORMALIZE_INTL ) {
 			# We exclude a few chars that ICU would not.
 			$string = preg_replace(
-- 
2.20.1