From 6f63dd2dad2ef76e07fe5a0b224aa541c30ff2ac Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 17 Mar 2020 10:22:16 +0000 Subject: [PATCH] Bug 24850: Always return 'instance' local time This patch adds handling to ensure we always convert a passed in time to the instance configured timezone.. --- Koha/DateUtils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm index 594caad046..e6ced94a94 100644 --- a/Koha/DateUtils.pm +++ b/Koha/DateUtils.pm @@ -54,7 +54,8 @@ sub dt_from_string { return if $date_string and $date_string =~ m|^0000-0|; my $do_fallback = defined($date_format) ? 0 : 1; - $tz = C4::Context->tz unless $tz;; + my $server_tz = C4::Context->tz; + $tz = C4::Context->tz unless $tz; return DateTime->now( time_zone => $tz ) unless $date_string; @@ -195,6 +196,7 @@ sub dt_from_string { ( $dt_params{year} < 9999 ? ( time_zone => $tz ) : () ), ); } + $dt->set_time_zone($server_tz); return $dt; } -- 2.20.1