From bb77ac8eb53b25fc88191e031603f6927cd2dc4d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 28 May 2020 13:01:14 +0000 Subject: [PATCH] Bug 25617: Pass 24hr to output_pref This patch changes the date formatting function used to create the current_date_and_time variable by adding '24hr' as the timeformat parameter. This avoids an error when the TimeFormat preference is set to 12hr. To test, apply the patch and go to the "About" page in the staff interface. It should work correctly. The "Date and time" information under the "Server information" tab should be correct. --- about.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.pl b/about.pl index 62a94d87f4..665d607b0a 100755 --- a/about.pl +++ b/about.pl @@ -115,7 +115,7 @@ my $time_zone = { $template->param( time_zone => $time_zone, - current_date_and_time => output_pref({ dt => dt_from_string(), dateformat => 'iso' }) + current_date_and_time => output_pref({ dt => dt_from_string(), dateformat => 'iso', timeformat => '24hr' }) ); my $perl_path = $^X; -- 2.11.0