diff options
| author | Xinchen Hui <laruence@php.net> | 2012-06-07 14:32:47 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-06-07 14:32:47 +0800 |
| commit | 83542dcf3b84767cc950e2def7b35ec3b4839edc (patch) | |
| tree | 70fe951f81e55467d344329d97cab3abec08eeef /ext/intl/msgformat/msgformat_parse.c | |
| parent | e118a0794a93e54d97ac42636e56c9b7e5904ecd (diff) | |
| parent | 6ecc9f1d9dfbfa264725aabcf52b75e31ce59deb (diff) | |
| download | php-git-83542dcf3b84767cc950e2def7b35ec3b4839edc.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (1) and Xinchen Hui (1)
* PHP-5.3:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
Fix ext/intl build on ICU < 4.8
Optimization in ext/intl/msgformat
Fixed tests in ext/intl
Changed XFAILed collator_get_sort_key.phpt
Diffstat (limited to 'ext/intl/msgformat/msgformat_parse.c')
| -rwxr-xr-x | ext/intl/msgformat/msgformat_parse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_parse.c b/ext/intl/msgformat/msgformat_parse.c index 8393d4c6e3..f540b1d0c4 100755 --- a/ext/intl/msgformat/msgformat_parse.c +++ b/ext/intl/msgformat/msgformat_parse.c @@ -129,11 +129,13 @@ PHP_FUNCTION( msgfmt_parse_message ) slocale = INTL_G(default_locale); } +#ifdef MSG_FORMAT_QUOTE_APOS if(msgformat_fix_quotes(&spattern, &spattern_len, &INTL_DATA_ERROR_CODE(mfo)) != SUCCESS) { intl_error_set( NULL, U_INVALID_FORMAT_ERROR, "msgfmt_parse_message: error converting pattern to quote-friendly format", 0 TSRMLS_CC ); RETURN_FALSE; } +#endif /* Create an ICU message formatter. */ MSG_FORMAT_OBJECT(mfo) = umsg_open(spattern, spattern_len, slocale, NULL, &INTL_DATA_ERROR_CODE(mfo)); |