cvs: php-src(PHP_5_2) /ext/standard html.c

bjori Fri May 25 14:09:02 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard html.c Log: Allow skipping hint_charset (fixes ext/standard/tests/strings/htmlentities18.phpt) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.11&r2=1.111.2.2.2.12&diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.11 php-src/ext/standard/html.c:1.111.2.2.2.12 --- php-src/ext/standard/html.c:1.111.2.2.2.11 Tue May 22 15:38:27 2007 +++ php-src/ext/standard/html.c Fri May 25 14:09:02 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.111.2.2.2.11 2007/05/22 15:38:27 bjori Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.12 2007/05/25 14:09:02 bjori Exp $ */ /* * HTML entity resources: @@ -1224,7 +1224,7 @@ 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; }