From: Adam Harvey <aharvey@php.net>
Date: Fri, 3 Feb 2012 04:17:11 +0000 (+0000)
Subject: Fix bug #60933 on PHP_5_4 (approved by Stas).
X-Git-Tag: php-5.4.0RC8~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98f5e51a7ee42cac9967a52a9753f94f23728cfd;p=php

Fix bug #60933 on PHP_5_4 (approved by Stas).
---

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index c83b5575f4..1db96042e8 100644
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -5,7 +5,7 @@ Sort with SORT_LOCALE_STRING
 if (substr(PHP_OS, 0, 3) == 'WIN') {
   die("skip Unix locale name only, not available on windows (and crashes with VC6)\n");
 }
-if (false == setlocale(LC_CTYPE, "fr_FR", "fr_FR.ISO8859-1")) {
+if (false == setlocale(LC_CTYPE, "fr_FR.ISO8859-1", "fr_FR")) {
   die("skip setlocale() failed\n");
 }
 ?>
@@ -14,7 +14,7 @@ unicode.script_encoding=ISO8859-1
 unicode.output_encoding=ISO8859-1
 --FILE--
 <?php
-setlocale(LC_ALL, 'fr_FR', 'fr_FR.ISO8859-1');
+setlocale(LC_ALL, 'fr_FR.ISO8859-1', 'fr_FR');
 $table = array("AB" => "Alberta",
 "BC" => "Colombie-Britannique",
 "MB" => "Manitoba",