cvs: php4(PHP_4_3) /ext/standard/tests/strings htmlentities16.phpt
| From: | Moriyoshi Koizumi | Date: | Tue, 29 Apr 2003 13:04:57 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/standard/tests/strings htmlentities16.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20580@lists.php.net to get a copy of this message | ||
moriyoshi Tue Apr 29 09:04:57 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/standard/tests/strings htmlentities16.phpt
Log:
MFH(r-1.3): fixed bogus skip condition
Index: php4/ext/standard/tests/strings/htmlentities16.phpt
diff -u php4/ext/standard/tests/strings/htmlentities16.phpt:1.1.2.2
php4/ext/standard/tests/strings/htmlentities16.phpt:1.1.2.3
--- php4/ext/standard/tests/strings/htmlentities16.phpt:1.1.2.2 Mon Mar 24 14:25:14 2003
+++ php4/ext/standard/tests/strings/htmlentities16.phpt Tue Apr 29 09:04:57 2003
@@ -5,11 +5,9 @@
--SKIPIF--
<?php
extension_loaded("mbstring") or die("skip mbstring not available\n");
- mb_internal_encoding('cp1251');
- $php_errormsg = NULL;
- @htmlentities("\x88\xa9\xd2\xcf\xd3\xcb\xcf\xdb\xce\xd9\xca", ENT_QUOTES, '');
- if ($php_errormsg) {
- die("skip cp1251 chracter set is not supported on this platform.\n");
+ if (!mb_internal_encoding('cp1251') ||
+ @htmlentities("\x88\xa9\xd2\xcf\xd3\xcb\xcf\xdb\xce\xd9\xca", ENT_QUOTES, '')
== '') {
+ die("skip cp1251 chracter set is not available in this build.\n");
}
?>
--FILE--