From a29af2d60598f21129f3c9829df7e9deff6be97f Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 14 Apr 2022 09:14:47 +0100 Subject: [PATCH] Bug 30540: eval on set_time_zone Content-Type: text/plain; charset=utf-8 This patch adds an eval around the call to set_time_zone so that we don't crash on invalid local dates and instead just keep the passed floating timezone. Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy --- Koha/DateUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/DateUtils.pm b/Koha/DateUtils.pm index 222aa16754..acd5dd13ff 100644 --- a/Koha/DateUtils.pm +++ b/Koha/DateUtils.pm @@ -293,7 +293,7 @@ sub output_pref { # FIXME: see bug 13242 => no TZ for dates 'infinite' if ( $dt->ymd !~ /^9999/ ) { my $tz = $dateonly ? DateTime::TimeZone->new(name => 'floating') : C4::Context->tz; - $dt->set_time_zone( $tz ); + eval { $dt->set_time_zone( $tz ); } } my $pref = -- 2.20.1