From 60052c3a73f84da61b31fba5582e6f32663e1c0d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 24 Dec 2014 13:09:27 +0100 Subject: [PATCH] [PASSED QA] Bug 11607: Don't display all items in a single line If the *DGST notices are sent in HTML, the items are displayed in a single line. To reproduce: 1/ Define a *DGST notice using the <> pattern. 2/ Checkout at least 2 items to a patron and set the due date as today. 3/ Launch the advance_notices.pl and process_message_queue.pl cronjobs. 4/ Verify the email you will receive separates the items with a line break. Verify you don't find a regression for non-html letters. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Note: the display in the notices tab is misleading here, needs to be verified checking the sent emails or database entries in message_queue. --- C4/Letters.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/C4/Letters.pm b/C4/Letters.pm index a11c862..e36c87f 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -620,6 +620,10 @@ sub GetPreparedLetter { if ($substitute) { while ( my ($token, $val) = each %$substitute ) { + if ( $token eq 'items.content' ) { + $val =~ s|\n|
|g if $letter->{is_html}; + } + $letter->{title} =~ s/<<$token>>/$val/g; $letter->{content} =~ s/<<$token>>/$val/g; } -- 1.9.1