From fd90d097becad854ba556d6539c6e25126fe8264 Mon Sep 17 00:00:00 2001
From: Sophie Meynieux <sophie.meynieux@biblibre.com>
Date: Tue, 20 May 2014 17:35:00 +0200
Subject: [PATCH] Bug 12294 : Cancel replacing carriage return on notices

Cancel replacing carriage return with <br /> in printed html file as <br /> is needed in model for email notices when html format is checked

Test plan :
* define an OVERDUE notice with html activated, with <br /> 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 <br /> at each end of line
* in html file, <br /> is duplicated at each end of line

With patch
* nothing changes for email notification
* html file is correctly formatted with only one <br /> at each end of line

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Copied test plan from comment.
No errors

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 misc/cronjobs/overdue_notices.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 2a9f8ae930..943c4867c6 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 = "<pre>\n";
-      my $content = $params->{'letter'}->{'content'};
-      $content =~ s/\n/<br \/>/g;
-      $content =~ s/\r//g;
-      $return .= "$content\n";
+      $return .= "$params->{'letter'}->{'content'}\n";
       $return .= "\n</pre>\n";
     } else {
         $return .= "$params->{'letter'}->{'content'}\n";
-- 
2.39.5