summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Magnusson <bjori@php.net>2007-05-22 15:38:27 +0000
committerHannes Magnusson <bjori@php.net>2007-05-22 15:38:27 +0000
commitcdd37424a8cdfbb99febe499a33bf4bccf341a4e (patch)
tree327faa9394d93bd39291baaf5866984637bfad79
parentc1ba2927aa949a003844f07d9fd2ac26cf8c8254 (diff)
downloadphp-git-cdd37424a8cdfbb99febe499a33bf4bccf341a4e.tar.gz
Update proto&arginfo for double_encode in htmlspecialchars()&htmlentities()
-rw-r--r--ext/standard/basic_functions.c2
-rw-r--r--ext/standard/html.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 765305e063..fe060e29de 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1665,6 +1665,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlspecialchars, 0, 0, 1)
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, quote_style)
ZEND_ARG_INFO(0, charset)
+ ZEND_ARG_INFO(0, double_encode)
ZEND_END_ARG_INFO()
static
@@ -1685,6 +1686,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_htmlentities, 0, 0, 1)
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, quote_style)
ZEND_ARG_INFO(0, charset)
+ ZEND_ARG_INFO(0, double_encode)
ZEND_END_ARG_INFO()
static
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 8ac7b417c5..59d02c1f3a 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1248,7 +1248,7 @@ void register_html_constants(INIT_FUNC_ARGS)
}
/* }}} */
-/* {{{ proto string htmlspecialchars(string string [, int quote_style][, string charset])
+/* {{{ proto string htmlspecialchars(string string [, int quote_style[, string charset[, bool double_encode]]])
Convert special characters to HTML entities */
PHP_FUNCTION(htmlspecialchars)
{
@@ -1345,7 +1345,7 @@ PHP_FUNCTION(html_entity_decode)
/* }}} */
-/* {{{ proto string htmlentities(string string [, int quote_style][, string charset])
+/* {{{ proto string htmlentities(string string [, int quote_style[, string charset[, bool double_encode]]])
Convert all applicable characters to HTML entities */
PHP_FUNCTION(htmlentities)
{