summaryrefslogtreecommitdiff
path: root/ext/intl/timezone/timezone_class.cpp
diff options
context:
space:
mode:
authorDerick Rethans <github@derickrethans.nl>2017-08-16 15:19:18 +0100
committerDerick Rethans <github@derickrethans.nl>2017-08-16 15:19:18 +0100
commit60a6feed0795df986238ec35a928fb032ea96a46 (patch)
tree311dd48d585b1a967517e798216ffa15a68b7325 /ext/intl/timezone/timezone_class.cpp
parent8af70958fc45f9aea905fa429e2ced0bd17c318c (diff)
downloadphp-git-60a6feed0795df986238ec35a928fb032ea96a46.tar.gz
Revert "Upgrade timelib to 2017.05beta7"
This reverts commit bdd56f31078bf1f34341943603cf6aaa72e0db5c.
Diffstat (limited to 'ext/intl/timezone/timezone_class.cpp')
-rw-r--r--ext/intl/timezone/timezone_class.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp
index 68afbd78ce..d1e8e2e0a6 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 seconds
- tzobj->tzi.utc_offset = timeZone->getRawOffset() / 1000;
+ //convert offset from milliseconds to minutes
+ tzobj->tzi.utc_offset = -1 * timeZone->getRawOffset() / (60 * 1000);
} else {
zend_string *u8str;
/* Call the constructor! */