diff options
| author | Derick Rethans <github@derickrethans.nl> | 2014-01-26 13:58:13 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2014-01-26 14:01:58 +0100 |
| commit | 22dba2f5f3211efe6c3b9bb24734c811ca64c68c (patch) | |
| tree | b1b110836acc9f9943d3561635813f214ea9cca9 /ext/date/php_date.h | |
| parent | 4e308abf28d542de0f1251b5e5c523d4701af4b4 (diff) | |
| download | php-git-22dba2f5f3211efe6c3b9bb24734c811ca64c68c.tar.gz | |
Fixed bug #45543: DateTime::setTimezone can not set timezones without ID.
Diffstat (limited to 'ext/date/php_date.h')
| -rw-r--r-- | ext/date/php_date.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 1d6a94d0ae..4ce730bb2b 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -122,14 +122,9 @@ struct _php_timezone_obj { int initialized; int type; union { - timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID; */ - timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */ - struct /* TIMELIB_ZONETYPE_ABBR */ - { - timelib_sll utc_offset; - char *abbr; - int dst; - } z; + timelib_tzinfo *tz; /* TIMELIB_ZONETYPE_ID */ + timelib_sll utc_offset; /* TIMELIB_ZONETYPE_OFFSET */ + timelib_abbr_info z; /* TIMELIB_ZONETYPE_ABBR */ } tzi; }; |