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.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.c')
| -rwxr-xr-x | ext/intl/msgformat/msgformat.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index 84f14de1bd..0a01204fae 100755 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -64,9 +64,11 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) locale = INTL_G(default_locale); } +#ifdef MSG_FORMAT_QUOTE_APOS if(msgformat_fix_quotes(&spattern, &spattern_len, &INTL_DATA_ERROR_CODE(mfo)) != SUCCESS) { INTL_CTOR_CHECK_STATUS(mfo, "msgfmt_create: error converting pattern to quote-friendly format"); } +#endif if ((mfo)->mf_data.orig_format) { msgformat_data_free(&mfo->mf_data TSRMLS_CC); |