diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-08-15 15:07:24 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-08-15 15:07:24 +0100 |
| commit | a063d55395c818c401b7efdf6b42b4728ce3df08 (patch) | |
| tree | 416f56ca182814aad18b4e5b9517014876559882 /ext/intl/timezone/timezone_class.cpp | |
| parent | b096eacdd1a00d2b8a1511539dbe77851bf25150 (diff) | |
| parent | 584db6f38fcac3e5e1ca4c770d3aacfff09ee371 (diff) | |
| download | php-git-a063d55395c818c401b7efdf6b42b4728ce3df08.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
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! */ |