svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt trunk/ext/standard/tests/array/locale_sort.phpt
| From: | Adam Harvey | Date: | Fri, 03 Feb 2012 01:21:24 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt trunk/ext/standard/tests/array/locale_sort.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67613@lists.php.net to get a copy of this message | ||
aharvey Fri, 03 Feb 2012 01:21:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323036
Log:
Fix bug #60933 (Testing asort with SORT_LOCALE_STRING fails on Mac OS X 10.6) on PHP_5_3 and trunk.
Bug: https://bugs.php.net/60933 (Assigned) Testing asort
with SORT_LOCALE_STRING fails on Mac OS X 10.6
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt
U php/php-src/trunk/ext/standard/tests/array/locale_sort.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt 2012-02-03 01:02:38 UTC
(rev 323035)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/array/locale_sort.phpt 2012-02-03 01:21:24 UTC
(rev 323036)
@@ -5,7 +5,7 @@
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.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",
Modified: php/php-src/trunk/ext/standard/tests/array/locale_sort.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/array/locale_sort.phpt 2012-02-03 01:02:38 UTC (rev 323035)
+++ php/php-src/trunk/ext/standard/tests/array/locale_sort.phpt 2012-02-03 01:21:24 UTC (rev 323036)
@@ -5,7 +5,7 @@
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.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",