From eadfe90e4e57c9d98e7f0054f795519e8f53e31d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 22 Mar 2013 09:52:18 +0100 Subject: [PATCH] [PASSED QA] Bug 9479: FIX conflict with Bug 9014 3rd parameters of output_pref is already used Signed-off-by: Katrin Fischer All tests and QA script pass. Checked sorting and display on notices page with various settings for dateformat and TimeFormat system preferences. Also checked other pages for correct display: - List of checkouts in patron account - Order search result list - Basket list in vendor search - Staff detail page --- Koha/Template/Plugin/KohaDates.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Koha/Template/Plugin/KohaDates.pm b/Koha/Template/Plugin/KohaDates.pm index 884c3e5..7c5ee68 100644 --- a/Koha/Template/Plugin/KohaDates.pm +++ b/Koha/Template/Plugin/KohaDates.pm @@ -36,7 +36,7 @@ sub filter { return "" unless $text; $config->{with_hours} //= 0; my $dt = dt_from_string( $text, 'iso' ); - return output_pref( $dt, undef, !$config->{with_hours} ); + return output_pref( $dt, undef, undef, !$config->{with_hours} ); } 1; -- 1.7.9.5