From 917054eaf63e656a521dc5742e2124a186d7c96c Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 7 Jun 2016 12:02:06 +0100 Subject: [PATCH] Bug 16624: Fix regression displaying a letter with hours MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bug 13622 has introduced a bug, if pref TimeFormat is 12hr and a date is displayed in both title and content of the letter. Test plan: 1 - Checkout an item (with default time 11:59:00 PM) 2 - Generate a quickslip 3 - Notice the time is 'AM' 4 - Apply patch 5 - Generate quickslip 6 - Note time is correct Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall (cherry picked from commit 6f0ce92543319d243cf185e3df9f91a9cf7f6d87) Signed-off-by: Frédéric Demians --- C4/Letters.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 1d0c3c09bb..192f3539b3 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -843,13 +843,13 @@ sub _parseletter { $filter_string_used = $1 || q{}; $dateonly = $1 unless $dateonly; } - eval { - $replacedby = output_pref({ dt => dt_from_string( $replacedby ), dateonly => $dateonly }); + my $replacedby_date = eval { + output_pref({ dt => dt_from_string( $replacedby ), dateonly => $dateonly }); }; if ( $letter->{ $letter_field } ) { - $letter->{ $letter_field } =~ s/\Q<<$table.$field$filter_string_used>>\E/$replacedby/g; - $letter->{ $letter_field } =~ s/\Q<<$field$filter_string_used>>\E/$replacedby/g; + $letter->{ $letter_field } =~ s/\Q<<$table.$field$filter_string_used>>\E/$replacedby_date/g; + $letter->{ $letter_field } =~ s/\Q<<$field$filter_string_used>>\E/$replacedby_date/g; } } } -- 2.39.5