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

diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php
index 621ef9d..0ae47f2 100644 (file)
--- 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(