MFB

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 666c4f650b9a02327dd9076f96989a6780d641ae..babec44b56efb0215f788cd6243ade842fcff5ab 100644 (file)
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -2,8 +2,8 @@
 htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15) 
 --SKIPIF--
 <?php
-$result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15");
-if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
+$result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');
+if (!$result) {
        die("skip setlocale() failed\n");
 }
 echo "warn possibly braindead libc\n";
@@ -14,7 +14,7 @@ default_charset=
 mbstring.internal_encoding=none
 --FILE--
 <?php
-       setlocale( LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15" );
+       setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');
        var_dump(htmlentities("\xbc\xbd\xbe", ENT_QUOTES, ''));
 ?>
 --EXPECT--