On Thu, Aug 14, 2008 at 04:56, Kalle Sommer Nielsen <[EMAIL PROTECTED]> wrote:
> kalle           Thu Aug 14 02:56:23 2008 UTC
>
>  Modified files:              (Branch: PHP_5_3)
>    /php-src    NEWS
>    /php-src/ext/standard       basic_functions.c string.c
>  Log:
>  MFH: Implemented feature request #34381 (nl2br() should have an option for 
> XHTML/HTML compatible BR element)
>
> http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.266&r2=1.2027.2.547.2.965.2.267&diff_format=u
> Index: php-src/NEWS
> diff -u php-src/NEWS:1.2027.2.547.2.965.2.266 
> php-src/NEWS:1.2027.2.547.2.965.2.267
> --- php-src/NEWS:1.2027.2.547.2.965.2.266       Wed Aug 13 11:20:25 2008
> +++ php-src/NEWS        Thu Aug 14 02:56:22 2008
> @@ -12,6 +12,9 @@
>  - Added litespeed SAPI module. (George Wang)
>  - Added ext/hash support to ext/session's ID generator. (Sara)
>
> +- Implemented feature request #34381 (nl2br() should have an option for
> +  XHTML/HTML compatible BR element) (Kalle)

Cool.
And nice that you documented it right away.. but remember to add it to
the scratchpad so it will be included in the upgrade guide.


> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.46&r2=1.725.2.31.2.64.2.47&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.64.2.46 
> php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.47
> --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.46 Thu Aug  7 
> 09:25:32 2008
> +++ php-src/ext/standard/basic_functions.c      Thu Aug 14 02:56:22 2008
> @@ -18,7 +18,7 @@
>    +----------------------------------------------------------------------+
>  */
>
> -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.46 2008/08/07 09:25:32 
> lbarnaud Exp $ */
> +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.47 2008/08/14 02:56:22 kalle 
> Exp $ */
>
>  #include "php.h"
>  #include "php_streams.h"
> @@ -2739,6 +2739,7 @@
>  static
>  ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0)
>        ZEND_ARG_INFO(0, str)
> +       ZEND_ARG_INFO(0, is_xhtml)

This is wrong. is_xhtml is optional.
it should be ZEND_BEGIN_ARG_INFO(arginfo_nl2br, 0, 0, 1)


-Hannes

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to