Attachment 29652 Details for Bug 12294 – [PASSED QA] Bug 12294 : Cancel replacing carriage return on notices

[patch] [PASSED QA] Bug 12294 : Cancel replacing carriage return on notices

PASSED-QA-Bug-12294--Cancel-replacing-carriage-ret.patch (text/plain), 1.91 KB, created by Kyle M Hall (khall) on 2014-07-11 16:03:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-07-11 16:03:11 UTC

Size: 1.91 KB

patch

obsolete

>From 522b5b062c9b4e62cd44a24930c9b0112fc7c83b 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] [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 <bgkriegel@gmail.com>
>
>Copied test plan from comment.
>No errors
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> 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 = "<pre>\n";
>- my $content = $params->{'letter'}->{'content'};
>- $content =~ s/\n/ /g;
>- $content =~ s/\r//g;
>- $return .= "$content\n";
>+ $return .= "$params->{'letter'}->{'content'}\n";
> $return .= "\n</pre>\n";
> } else {
> $return .= "$params->{'letter'}->{'content'}\n";
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 12294: 28374 | 29151 | 29652