cvs: php-src(PHP_5_3) /ext/date php_date.c

bjori Tue May 19 19:23:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: MFH: Partial fix for bug#48333 http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.76&r2=1.43.2.45.2.51.2.77&diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.76 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.77 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.76 Tue May 19 15:38:07 2009 +++ php-src/ext/date/php_date.c Tue May 19 19:23:33 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.76 2009/05/19 15:38:07 jani Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.77 2009/05/19 19:23:33 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -339,11 +339,13 @@ ZEND_ARG_INFO(0, time) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_interval_format, 0, 0, 2) ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_date_method_interval_format, 0) + ZEND_ARG_INFO(0, format) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_date_period_construct, 0, 0, 3) @@ -3570,7 +3572,7 @@ } /* }}} */ -/* {{{ proto string date_interval_format(DateInterval object) +/* {{{ proto string date_interval_format(DateInterval object, string format) Formats the interval. */ PHP_FUNCTION(date_interval_format)