From 325ca60fa7586bd387a9a65653bce3761393dabe Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Fri, 3 Feb 2012 01:21:24 +0000
Subject: [PATCH] Fix bug #60933 (Testing asort with SORT_LOCALE_STRING fails
 on Mac OS X 10.6) on PHP_5_3 and trunk.

---
 ext/standard/tests/array/locale_sort.phpt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index c83b5575f46..1db96042e8d 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",