diff options
| author | Xinchen Hui <laruence@php.net> | 2012-06-07 14:42:35 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-06-07 14:42:35 +0800 |
| commit | 07d0eab204c19ceca259319c38af79e64b61aecd (patch) | |
| tree | 262d04f1902d9806062ec3df8d5825068e66aaf2 /ext/intl/msgformat/msgformat_format.c | |
| parent | c22a29b57639178581210ec377ea4e9909f828c9 (diff) | |
| parent | 83542dcf3b84767cc950e2def7b35ec3b4839edc (diff) | |
| download | php-git-07d0eab204c19ceca259319c38af79e64b61aecd.tar.gz | |
Merge branch 'PHP-5.4'
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (2) and Xinchen Hui (2)
* PHP-5.4:
Remove unused codes
based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
merge 5.3 entries
restore NEWS
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_format.c')
| -rwxr-xr-x | ext/intl/msgformat/msgformat_format.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_format.c b/ext/intl/msgformat/msgformat_format.c index 821adad094..39652327b9 100755 --- a/ext/intl/msgformat/msgformat_format.c +++ b/ext/intl/msgformat/msgformat_format.c @@ -137,11 +137,13 @@ PHP_FUNCTION( msgfmt_format_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_format_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)); |