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 2700877..877ea76 100644 (file)
--- 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" );