From: Nuno Lopes <nlopess@php.net>
Date: Wed, 27 Dec 2006 15:18:15 +0000 (+0000)
Subject: MFB
X-Git-Tag: RELEASE_1_0_0RC1~484
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1511cee1a07f821fd196b8535dba601448c57c66;p=php

MFB
---

diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 666c4f650b..babec44b56 100644
--- 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--