--- embedaddon/php/ext/standard/tests/strings/htmlentities07.phpt	2012/02/21 23:48:04	1.1.1.1
+++ embedaddon/php/ext/standard/tests/strings/htmlentities07.phpt	2012/05/29 12:34:45	1.1.1.2
@@ -2,16 +2,10 @@
 htmlentities() test 7 (mbstring / ISO-8859-1)
 --INI--
 output_handler=
+mbstring.internal_encoding=ISO-8859-1
 --SKIPIF--
 <?php
 	extension_loaded("mbstring") or die("skip mbstring not available\n");
-	mb_internal_encoding('ISO-8859-1');
-	$php_errormsg = NULL;
-	@htmlentities("\xe4\xf6\xfc", ENT_QUOTES, '');
-	if ($php_errormsg) {
-		die("skip ISO-8859-1 chracter set is not supported on this platform.\n");
-	}
-?>
 --FILE--
 <?php
 	mb_internal_encoding('ISO-8859-1');