From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Thu, 22 Apr 2004 23:06:23 +0000 (+0000)
Subject: sileced iconv for now
X-Git-Tag: 1.3.0beta1~320
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8e1714db3338c72567d8d461ada31daf1490535a;p=lhc%2Fweb%2Fwiklou.git

sileced iconv for now
---

diff --git a/languages/Language.php b/languages/Language.php
index 7e26d5bdd5..622117da3e 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1812,7 +1812,7 @@ class Language {
                 '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ) : true );
 
 		if( ($wgInputEncoding != "utf-8") and $ishigh and $isutf )
-			return iconv( "UTF-8", $wgInputEncoding, $s );
+			return @iconv( "UTF-8", $wgInputEncoding, $s );
 		
 		if( ($wgInputEncoding == "utf-8") and $ishigh and !$isutf )
 			return utf8_encode( $s );