Re: cvs: php-src(PHP_5_3) /ext/intl intl_error.c php_intl.c php_intl.h
| From: | Hannes Magnusson | Date: | Fri, 10 Jul 2009 07:41:22 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_3) /ext/intl intl_error.c php_intl.c php_intl.h | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-59361@lists.php.net to get a copy of this message | ||
On Tue, Jul 7, 2009 at 23:25, Stanislav Malyshev<stas@php.net> wrote:
> stas       Tue Jul  7 21:25:47 2009 UTC
>
> Â Modified files: Â Â Â Â Â Â Â (Branch: PHP_5_3)
>   /php-src/ext/intl  intl_error.c php_intl.c php_intl.h
> Â Log:
> Â merge errors support
>
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.1.2.4&r2=1.1.2.5&diff_format=uÕ'H:†
> øRµ=(8ŽÐ@{
> Index: php-src/ext/intl/intl_error.c
> diff -u php-src/ext/intl/intl_error.c:1.1.2.4 php-src/ext/intl/intl_error..c:1.1.2.5
> --- php-src/ext/intl/intl_error.c:1.1.2.4 Â Â Â Sun May 10 20:58:26 2009
> +++ php-src/ext/intl/intl_error.c    Tue Jul  7 21:25:46 2009
> @@ -103,6 +103,9 @@
> Â Â Â Â if( !msg )
> Â Â Â Â Â Â Â Â return;
>
> + Â Â Â if(!err && INTL_G(error_level)) {
> + Â Â Â Â Â Â Â php_error_docref(NULL TSRMLS_CC, INTL_G(error_level), "%s",
> msg);
> + Â Â Â }
> Â Â Â Â if( !err && !( err = intl_g_error_get( TSRMLS_C ) ) )
> Â Â Â Â Â Â Â Â return;
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/intl/php_intl.c?r1=1.1.2.9&r2=1.1.2.10&diff_format=u
> Index: php-src/ext/intl/php_intl.c
> diff -u php-src/ext/intl/php_intl.c:1.1.2.9 php-src/ext/intl/php_intl.c:1..1.2.10
> --- php-src/ext/intl/php_intl.c:1.1.2.9 Mon Jan 26 22:30:56 2009
> +++ php-src/ext/intl/php_intl.c Tue Jul  7 21:25:46 2009
> @@ -454,6 +454,7 @@
> Â /* {{{ INI Settings */
> Â PHP_INI_BEGIN()
> Â Â STD_PHP_INI_ENTRY(LOCALE_INI_NAME, NULL, PHP_INI_ALL, OnUpdateStringUnempty,
> default_locale, zend_intl_globals, intl_globals)
> + Â Â STD_PHP_INI_ENTRY("intl.error_level", "0", PHP_INI_ALL,
> OnUpdateLong, error_level, zend_intl_globals, intl_globals)
Remember to add this option to both php.ini- files ones svn opens.
-Hannes