From 522b5b062c9b4e62cd44a24930c9b0112fc7c83b Mon Sep 17 00:00:00 2001 From: Sophie Meynieux Date: Tue, 20 May 2014 17:35:00 +0200 Subject: [PATCH] [PASSED QA] Bug 12294 : Cancel replacing carriage return on notices Cancel replacing carriage return with
in printed html file as
is needed in model for email notices when html format is checked Test plan : * define an OVERDUE notice with html activated, with
at each end of line * make sur you've got some borrowers with overdues meeting your notices triggering rules (some with valid email and others without) * run overdue_notices.pl -html to generate html files for borrowers without email Without patch * email notifications are correctly formated as html content, with one
at each end of line * in html file,
is duplicated at each end of line With patch * nothing changes for email notification * html file is correctly formatted with only one
at each end of line Signed-off-by: Bernardo Gonzalez Kriegel Copied test plan from comment. No errors Signed-off-by: Kyle M Hall --- misc/cronjobs/overdue_notices.pl | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 2a9f8ae..943c486 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -822,10 +822,7 @@ sub prepare_letter_for_printing { } } elsif ( exists $params->{'outputformat'} && $params->{'outputformat'} eq 'html' ) { $return = "
\n";
-      my $content = $params->{'letter'}->{'content'};
-      $content =~ s/\n/
/g; - $content =~ s/\r//g; - $return .= "$content\n"; + $return .= "$params->{'letter'}->{'content'}\n"; $return .= "\n
\n"; } else { $return .= "$params->{'letter'}->{'content'}\n"; -- 1.7.2.5