diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-08-15 15:06:18 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-08-15 15:06:18 +0100 |
| commit | 584db6f38fcac3e5e1ca4c770d3aacfff09ee371 (patch) | |
| tree | 5223b28c60a05d7870ea2d76b7bdbd84bcf0b2d8 /ext/intl/timezone/timezone_class.cpp | |
| parent | 3bc12268041bdeec9941c99f08b71620f7572eb0 (diff) | |
| download | php-git-584db6f38fcac3e5e1ca4c770d3aacfff09ee371.tar.gz | |
Merged PHP-7.0 by hand due to conflicts.
Diffstat (limited to 'ext/intl/timezone/timezone_class.cpp')
| -rw-r--r-- | ext/intl/timezone/timezone_class.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index f67e55ae4e..b036de81cf 100644 --- a/ext/intl/timezone/timezone_class.cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -83,8 +83,8 @@ U_CFUNC zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, * so we must mess with DateTimeZone structure ourselves */ tzobj->initialized = 1; tzobj->type = TIMELIB_ZONETYPE_OFFSET; - //convert offset from milliseconds to minutes - tzobj->tzi.utc_offset = -1 * timeZone->getRawOffset() / (60 * 1000); + //convert offset from milliseconds to seconds + tzobj->tzi.utc_offset = timeZone->getRawOffset() / 1000; } else { zend_string *u8str; /* Call the constructor! */ |