From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 16 Apr 2011 00:23:07 +0000 (+0000)
Subject: Revert r85536 pending a better fix
X-Git-Tag: 1.31.0-rc.0~30807
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=700d35ed29c4b5e3aed265894ae40ae0a10d2bbf;p=lhc%2Fweb%2Fwiklou.git

Revert r85536 pending a better fix
---

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