diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-08-15 14:09:09 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-08-15 14:10:23 +0100 |
| commit | bdd56f31078bf1f34341943603cf6aaa72e0db5c (patch) | |
| tree | d253a2e3a54e09e7691b5066dcfeb5f713551c96 /ext/intl/common/common_date.cpp | |
| parent | 3af6201224f0160570afa1ec21e9db3c69e7bafc (diff) | |
| download | php-git-bdd56f31078bf1f34341943603cf6aaa72e0db5c.tar.gz | |
Upgrade timelib to 2017.05beta7
Diffstat (limited to 'ext/intl/common/common_date.cpp')
| -rw-r--r-- | ext/intl/common/common_date.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/common/common_date.cpp b/ext/intl/common/common_date.cpp index f1bf75ab0f..01d27cc35f 100644 --- a/ext/intl/common/common_date.cpp +++ b/ext/intl/common/common_date.cpp @@ -56,8 +56,8 @@ U_CFUNC TimeZone *timezone_convert_datetimezone(int type, break; case TIMELIB_ZONETYPE_OFFSET: { int offset_mins = is_datetime - ? -((php_date_obj*)object)->time->z - : -(int)((php_timezone_obj*)object)->tzi.utc_offset, + ? ((php_date_obj*)object)->time->z / 60 + : (int)((php_timezone_obj*)object)->tzi.utc_offset / 60, hours = offset_mins / 60, minutes = offset_mins - hours * 60; minutes *= minutes > 0 ? 1 : -1; |