From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Tue, 20 Jul 2010 16:14:09 +0000 (+0000)
Subject: fixes r69333 — remove dependency on iconv, use icu or native only
X-Git-Tag: 1.31.0-rc.0~36041
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=104444bbb55c63d1519ba977292a9247407329b6;p=lhc%2Fweb%2Fwiklou.git

fixes r69333 — remove dependency on iconv, use icu or native only
---

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(