From 584db6f38fcac3e5e1ca4c770d3aacfff09ee371 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 15 Aug 2017 15:06:18 +0100 Subject: Merged PHP-7.0 by hand due to conflicts. --- ext/intl/timezone/timezone_class.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/intl/timezone/timezone_class.cpp') 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! */ -- cgit v1.2.1