From c0d060f5c02db168f1de895b41afffbc6e3cacfb Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:04:26 +0800 Subject: Bump year --- ext/date/php_date.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/date/php_date.h') diff --git a/ext/date/php_date.h b/ext/date/php_date.h index be0df38b69..1d6a94d0ae 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 47c902777297ce895aa915c13efdb00881af3669 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:06:16 +0800 Subject: Bump year --- ext/date/php_date.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/date/php_date.h') diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 536629a25f..d4204ebd79 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1 From 22dba2f5f3211efe6c3b9bb24734c811ca64c68c Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Sun, 26 Jan 2014 13:58:13 +0100 Subject: Fixed bug #45543: DateTime::setTimezone can not set timezones without ID. --- ext/date/php_date.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'ext/date/php_date.h') 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; }; -- cgit v1.2.1