diff options
| author | Derick Rethans <derick@php.net> | 2006-01-04 21:31:35 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2006-01-04 21:31:35 +0000 |
| commit | 88268c6bcc1a471bf28d9b97d8395a7a3f998759 (patch) | |
| tree | fe530115865563a919f25c60b4713317214bf69e /ext/date/lib/unixtime2tm.c | |
| parent | 594139b1ea9e86ca188f630195dd4ecf156dfd91 (diff) | |
| download | php-git-88268c6bcc1a471bf28d9b97d8395a7a3f998759.tar.gz | |
- MFH: Fixed bug #35887 (wddx_deserialize not parsing dateTime fields properly).
- MFH: Fixed bug #35885 (strtotime("NOW") no longer works).
- MFH: Fixed bug #33789 (Many Problems with SunFuncs).
- MFH: Fixed bug #33671 (sun_rise and sun_set don't return a GMT timestamp if one
passes an offset).
- MFH: Fixed bug #32820 (date_sunrise and date_sunset don't handle GMT offset
well).
- MFH: Fixed bug #30937 (date_sunrise() & date_sunset() don't handle endless
day/night at high latitudes).
Diffstat (limited to 'ext/date/lib/unixtime2tm.c')
| -rw-r--r-- | ext/date/lib/unixtime2tm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/date/lib/unixtime2tm.c b/ext/date/lib/unixtime2tm.c index a12474847e..4834b470d9 100644 --- a/ext/date/lib/unixtime2tm.c +++ b/ext/date/lib/unixtime2tm.c @@ -170,9 +170,6 @@ void timelib_unixtime2local(timelib_time *tm, timelib_sll ts) timelib_time_offset *gmt_offset; timelib_tzinfo *tz = tm->tz_info; - tm->is_localtime = 1; - tm->have_zone = 1; - switch (tm->zone_type) { case TIMELIB_ZONETYPE_ABBR: case TIMELIB_ZONETYPE_OFFSET: { @@ -203,7 +200,11 @@ void timelib_unixtime2local(timelib_time *tm, timelib_sll ts) default: tm->is_localtime = 0; tm->have_zone = 0; + return; } + + tm->is_localtime = 1; + tm->have_zone = 1; } void timelib_set_timezone(timelib_time *t, timelib_tzinfo *tz) |