From: Hannes Magnusson <bjori@php.net>
Date: Fri, 25 May 2007 14:09:02 +0000 (+0000)
Subject: Allow skipping hint_charset (fixes ext/standard/tests/strings/htmlentities18.phpt)
X-Git-Tag: php-5.2.3~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df03be1a3b4226103d1fc376abbbee460186e415;p=php

Allow skipping hint_charset (fixes ext/standard/tests/strings/htmlentities18.phpt)
---

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 59d02c1f3a..9d73ce216c 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1224,7 +1224,7 @@ static void php_html_entities(INTERNAL_FUNCTION_PARAMETERS, int all)
 	char *replaced;
 	zend_bool double_encode = 1;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lsb", &str, &str_len, &quote_style, &hint_charset, &hint_charset_len, &double_encode) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ls!b", &str, &str_len, &quote_style, &hint_charset, &hint_charset_len, &double_encode) == FAILURE) {
 		return;
 	}