Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl intl_error.c php_intl.c php_intl.h
On Tue, Jul 7, 2009 at 23:25, Stanislav Malyshevs...@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.4r2=1.1.2.5diff_format=u
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.9r2=1.1.2.10diff_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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl intl_error.c php_intl.c php_intl.h
stasTue 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.4r2=1.1.2.5diff_format=u
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.9r2=1.1.2.10diff_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)
PHP_INI_END()
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/php_intl.h?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/php_intl.h
diff -u php-src/ext/intl/php_intl.h:1.1.2.1 php-src/ext/intl/php_intl.h:1.1.2.2
--- php-src/ext/intl/php_intl.h:1.1.2.1 Mon Jul 7 22:51:02 2008
+++ php-src/ext/intl/php_intl.h Tue Jul 7 21:25:46 2009
@@ -45,6 +45,7 @@
collator_compare_func_t compare_func;
UBreakIterator* grapheme_iterator;
intl_error g_error;
+ long error_level;
ZEND_END_MODULE_GLOBALS(intl)
/* Macro to access request-wide global variables. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl intl_error.c
stasSun May 10 20:58:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl intl_error.c
Log:
revent wrong part
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.1.2.3
php-src/ext/intl/intl_error.c:1.1.2.4
--- php-src/ext/intl/intl_error.c:1.1.2.3 Sun May 10 19:10:36 2009
+++ php-src/ext/intl/intl_error.c Sun May 10 20:58:26 2009
@@ -173,9 +173,7 @@
*/
void intl_error_set( intl_error* err, UErrorCode code, char* msg, int copyMsg
TSRMLS_DC )
{
- if(err) {
- intl_error_set_code( err, code TSRMLS_CC );
- }
+ intl_error_set_code( err, code TSRMLS_CC );
intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
