diff options
| author | Stanislav Malyshev <stas@php.net> | 2009-01-30 21:45:17 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2009-01-30 21:45:17 +0000 |
| commit | b0a33fff0d4c527d36bfd5c7575b348b67f1648a (patch) | |
| tree | c218f8290563bae942a0ebea7c826a44d2a4dc3b | |
| parent | 4342d0b6b791db3e760342e27e7cc5d497ee8669 (diff) | |
| download | php-git-b0a33fff0d4c527d36bfd5c7575b348b67f1648a.tar.gz | |
fix bug #14562
| -rwxr-xr-x | ext/intl/formatter/formatter_parse.c | 11 | ||||
| -rwxr-xr-x | ext/intl/tests/bug14562.phpt | 28 |
2 files changed, 39 insertions, 0 deletions
diff --git a/ext/intl/formatter/formatter_parse.c b/ext/intl/formatter/formatter_parse.c index 3585eafb31..dbf6c9d4e1 100755 --- a/ext/intl/formatter/formatter_parse.c +++ b/ext/intl/formatter/formatter_parse.c @@ -19,12 +19,15 @@ #endif #include <unicode/ustring.h> +#include <locale.h> #include "php_intl.h" #include "formatter_class.h" #include "formatter_format.h" #include "formatter_parse.h" +#define ICU_LOCALE_BUG 1 + /* {{{ proto mixed NumberFormatter::parse( string $str[, int $type, int &$position ]) * Parse a number. }}} */ /* {{{ proto mixed numfmt_parse( NumberFormatter $nf, string $str[, int $type, int &$position ]) @@ -40,6 +43,7 @@ PHP_FUNCTION( numfmt_parse ) double val_double; int32_t* position_p = NULL; zval *zposition = NULL; + char *oldlocale; FORMATTER_METHOD_INIT_VARS; /* Parse parameters. */ @@ -61,6 +65,10 @@ PHP_FUNCTION( numfmt_parse ) position_p = &position; } +#if ICU_LOCALE_BUG && defined(LC_NUMERIC) + oldlocale = setlocale(LC_NUMERIC, "C"); +#endif + switch(type) { case FORMAT_TYPE_INT32: val32 = unum_parse(FORMATTER_OBJECT(nfo), str, str_len, position_p, &INTL_DATA_ERROR_CODE(nfo)); @@ -84,6 +92,9 @@ PHP_FUNCTION( numfmt_parse ) RETVAL_FALSE; break; } +#if ICU_LOCALE_BUG && defined(LC_NUMERIC) + setlocale(LC_NUMERIC, oldlocale); +#endif if(zposition) { zval_dtor(zposition); ZVAL_LONG(zposition, position); diff --git a/ext/intl/tests/bug14562.phpt b/ext/intl/tests/bug14562.phpt new file mode 100755 index 0000000000..3256268405 --- /dev/null +++ b/ext/intl/tests/bug14562.phpt @@ -0,0 +1,28 @@ +--TEST-- +Bug #14562 NumberFormatter breaks when locale changes +--SKIPIF-- +<?php if( !extension_loaded( 'intl' ) ) print 'skip'; ?> +--FILE-- +<?php + +function ut_main() +{ + $res_str = ""; + $de_locale="de_DE.UTF-8"; + $fmt = new NumberFormatter("de", NumberFormatter::DECIMAL ); + $numeric = $fmt->parse("1234,56"); + $res_str .= "$numeric\n"; + setlocale(LC_ALL, $de_locale); + $fmt = new NumberFormatter("de", NumberFormatter::DECIMAL ); + $numeric = $fmt->parse("1234,56"); + $res_str .= "$numeric\n"; + return $res_str; +} + +include_once( 'ut_common.inc' ); +ut_run(); + +?> +--EXPECT-- +1234.56 +1234.56 |