From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 8 Aug 2008 09:37:22 +0000 (+0000)
Subject: Don't limit setlocale() hack to PHP 5.2.6, as per comment on bug 14944.
X-Git-Tag: 1.31.0-rc.0~46026
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=e3cc5d722fa05cde11e68052045a5d9c67f80180;p=lhc%2Fweb%2Fwiklou.git

Don't limit setlocale() hack to PHP 5.2.6, as per comment on bug 14944.
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 270087705d..877ea76659 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -118,10 +118,8 @@ if ( $wgUseSharedUploads ) {
  * Workaround for http://bugs.php.net/bug.php?id=45132
  * escapeshellarg() destroys non-ASCII characters if LANG is not a UTF-8 locale
  */
-if ( version_compare( PHP_VERSION, '5.2.6', '>=' ) ) {
-	putenv( 'LC_CTYPE=en_US.UTF-8' );
-	setlocale( LC_CTYPE, 'en_US.UTF-8' );
-}
+putenv( 'LC_CTYPE=en_US.UTF-8' );
+setlocale( LC_CTYPE, 'en_US.UTF-8' );
 
 if ( !class_exists( 'AutoLoader' ) ) {
 	require_once( "$IP/includes/AutoLoader.php" );