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

- Fixed bug #45529 (new DateTimeZone() and date_create()->getTimezone() behave

Browse source 
different).
This commit is contained in:
Derick Rethans 2008-07-16 15:40:01 +00:00
parent 327c317309
commit b9c97d72a8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/date/lib/parse_date.c
View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Tue Jul 15 19:35:53 2008 */ /* Generated by re2c 0.13.5 on Wed Jul 16 17:39:20 2008 */
#line 1 "ext/date/lib/parse_date.re" #line 1 "ext/date/lib/parse_date.re"
/* /*
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
@ -800,7 +800,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_
} }
#endif #endif
/* If we have a TimeZone identifier to start with, use it */ /* If we have a TimeZone identifier to start with, use it */
if (strstr(tz_abbr, "/")) { if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) {
if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) {
t->tz_info = res; t->tz_info = res;
t->zone_type = TIMELIB_ZONETYPE_ID; t->zone_type = TIMELIB_ZONETYPE_ID;

2
ext/date/lib/parse_date.re
View file

@ -798,7 +798,7 @@ static long timelib_get_zone(char **ptr, int *dst, timelib_time *t, int *tz_not_
} }
#endif #endif
/* If we have a TimeZone identifier to start with, use it */ /* If we have a TimeZone identifier to start with, use it */
if (strstr(tz_abbr, "/")) { if (strstr(tz_abbr, "/") || strcmp(tz_abbr, "UTC") == 0) {
if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) { if ((res = timelib_parse_tzfile(tz_abbr, tzdb)) != NULL) {
t->tz_info = res; t->tz_info = res;
t->zone_type = TIMELIB_ZONETYPE_ID; t->zone_type = TIMELIB_ZONETYPE_ID;