archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  Fix #68471: IntlDateFormatter fails for "GMT+00:00" timezone
This commit is contained in:
Christoph M. Becker 2021-06-28 13:56:59 +02:00
commit 1ae34385e1
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/intl/timezone/timezone_class.cpp
View file

@ -175,8 +175,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
return timezone_convert_datetimezone(tzobj->type, tzobj, 0,
outside_error, func);
} else {
UnicodeString id,
gottenId;
UnicodeString id;
UErrorCode status = U_ZERO_ERROR; /* outside_error may be NULL */
if (!try_convert_to_string(zv_timezone)) {
zval_ptr_dtor_str(&local_zv_tz);
@ -203,7 +202,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone,
zval_ptr_dtor_str(&local_zv_tz);
return NULL;
}
if (timeZone->getID(gottenId) != id) {
if (*timeZone == TimeZone::getUnknown()) {
spprintf(&message, 0, "%s: No such time zone: '%s'",
func, Z_STRVAL_P(zv_timezone));
if (message) {