bjori Tue May 22 15:38:27 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard html.c basic_functions.c
Log:
Update proto&arginfo for double_encode in htmlspecialchars()&htmlentities()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.10&r2=1.111.2.2.2.11&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.10
php-src/ext/standard/html.c:1.111.2.2.2.11
--- php-src/ext/standard/html.c:1.111.2.2.2.10 Tue May 22 12:37:00 2007
+++ php-src/ext/standard/html.c Tue May 22 15:38:27 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.111.2.2.2.10 2007/05/22 12:37:00 iliaa Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.11 2007/05/22 15:38:27 bjori Exp $ */
/*
* HTML entity resources:
@@ -1248,7 +1248,7 @@
}
/* }}} */
-/* {{{ 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 @@
/* }}} */
-/* {{{ 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)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.52&r2=1.725.2.31.2.53&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.52
php-src/ext/standard/basic_functions.c:1.725.2.31.2.53
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.52 Tue May 22
14:34:22 2007
+++ php-src/ext/standard/basic_functions.c Tue May 22 15:38:27 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.52 2007/05/22 14:34:22 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.53 2007/05/22 15:38:27 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1665,6 +1665,7 @@
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_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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
