Bugzilla – Attachment 52122 Details for
Bug 16624
Times are formatted incorrectly in slips ( AM PM ) due to double processing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16624: Fix regression displaying a letter with hours
Bug-16624-Fix-regression-displaying-a-letter-with-.patch (text/plain), 1.72 KB, created by
Jonathan Druart
on 2016-06-07 11:06:57 UTC
(
hide
)
Description:
Bug 16624: Fix regression displaying a letter with hours
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-06-07 11:06:57 UTC
Size:
1.72 KB
patch
obsolete
>From 29b8c61ad17cb918134b7e48cdbc5df66335b8ee Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 7 Jun 2016 12:02:06 +0100 >Subject: [PATCH] Bug 16624: Fix regression displaying a letter with hours > >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 >--- > C4/Letters.pm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 1d0c3c0..192f353 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.8.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16624
:
51934
|
51937
|
52121
|
52122
|
52126
|
52127
|
52453
|
52546
|
52547