From e3cc5d722fa05cde11e68052045a5d9c67f80180 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Fri, 8 Aug 2008 09:37:22 +0000 Subject: [PATCH] Don't limit setlocale() hack to PHP 5.2.6, as per comment on bug 14944. --- includes/Setup.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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" ); -- 2.20.1