From f7191123fd16e5d473493b68b70f90428a12cbb5 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 4 Feb 2016 09:50:39 +0900 Subject: [PATCH] Always use the internal timezone in ztime() function --- common/legacy.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/legacy.php b/common/legacy.php index df21108cb..7d86ffc1a 100644 --- a/common/legacy.php +++ b/common/legacy.php @@ -578,7 +578,8 @@ function ztime($str) { $hour = $min = $sec = 0; } - return mktime($hour, $min, $sec, $month, $day, $year); + $offset = Rhymix\Framework\Config::get('locale.internal_timezone') ?: date('Z'); + return gmmktime($hour, $min, $sec, $month, $day, $year) - $offset; } /**