From cdd37424a8cdfbb99febe499a33bf4bccf341a4e Mon Sep 17 00:00:00 2001
From: Hannes Magnusson <bjori@php.net>
Date: Tue, 22 May 2007 15:38:27 +0000
Subject: [PATCH] Update proto&arginfo for double_encode in
 htmlspecialchars()&htmlentities()

---
 ext/standard/basic_functions.c | 2 ++
 ext/standard/html.c            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 765305e063e..fe060e29de4 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 8ac7b417c5f..59d02c1f3aa 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)
 {