diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-06-12 18:56:55 +0100 |
| commit | b44cf1a8540d321583a0d83ebca688ebab10d3b0 (patch) | |
| tree | b7fbafb4113ea150381a9bba7f98f45027e35b0b /ext/intl/msgformat/msgformat_helpers.cpp | |
| parent | 6ac8bc4ecb1fdf112eefdd16d2c4f971e7ac232a (diff) | |
| parent | a2f4c32eb14221de79009aadaa3da9c3349e3526 (diff) | |
| download | php-git-b44cf1a8540d321583a0d83ebca688ebab10d3b0.tar.gz | |
Merge branch 'PHP-7.0' into openssl_error_store
Diffstat (limited to 'ext/intl/msgformat/msgformat_helpers.cpp')
| -rw-r--r-- | ext/intl/msgformat/msgformat_helpers.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index ed63105fa7..ce7899edd9 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -264,6 +264,10 @@ static HashTable *umsg_parse_format(MessageFormatter_object *mfo, type = Formattable::kDouble; } else if (argType == UMSGPAT_ARG_TYPE_SELECT) { type = Formattable::kString; +#if U_ICU_VERSION_MAJOR_NUM >= 50 + } else if (argType == UMSGPAT_ARG_TYPE_SELECTORDINAL) { + type = Formattable::kDouble; +#endif } else { type = Formattable::kString; } |