From e647d79ce9f05f31c09df978f824fb2648266503 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Wed, 6 Apr 2011 13:50:45 +0000 Subject: [PATCH] Merge from 1.17wmf1: r84259 --- languages/Language.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/languages/Language.php b/languages/Language.php index e92fdc0fb7..8e62c3b1b6 100644 --- 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; } -- 2.20.1