archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #69398 IntlDateFormatter formatObject returns wrong value when time style is NONE

Browse source
This commit is contained in:
Mic 2016-06-02 22:37:44 +02:00 • committed by Anatol Belski
parent 527ddacd20
commit 0112b64a34
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/intl/dateformat/dateformat_format_object.cpp
View file

@ -146,7 +146,9 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
}
//there's no support for relative time in ICU yet
timeStyle = (DateFormat::EStyle)(timeStyle & ~DateFormat::kRelative);
if (timeStyle != DateFormat::NONE) {
timeStyle = (DateFormat::EStyle)(timeStyle & ~DateFormat::kRelative);
}
zend_class_entry *instance_ce = Z_OBJCE_P(object);
if (instanceof_function(instance_ce, Calendar_ce_ptr)) {