Merge from 1.17wmf1: r84259

diff --git a/languages/Language.php b/languages/Language.php
index e92fdc0..8e62c3b 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1863,8 +1863,7 @@ class Language {
                        return $s;
                }
 
-               $isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
-                               '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
+               $isutf8 = ( $s == iconv("UTF-8","UTF-8//IGNORE", $s));
                if ( $isutf8 ) {
                        return $s;
                }