summaryrefslogtreecommitdiff
path: root/ext/intl/formatter/formatter_parse.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/formatter/formatter_parse.c')
-rwxr-xr-xext/intl/formatter/formatter_parse.c11
1 files changed, 11 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);