Bugzilla – Attachment 14546 Details for
Bug 9372
Automatic carriage return in message_queue where content_type is html
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9372 - Automatic carriage return in message_queue where content_type is html - Followup
Bug-9372---Automatic-carriage-return-in-messageque.patch (text/plain), 1.68 KB, created by
Kyle M Hall (khall)
on 2013-01-11 19:49:20 UTC
(
hide
)
Description:
Bug 9372 - Automatic carriage return in message_queue where content_type is html - Followup
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-01-11 19:49:20 UTC
Size:
1.68 KB
patch
obsolete
>From d267177f06e641e4bde411ccb451e298ce166588 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 11 Jan 2013 14:46:59 -0500 >Subject: [PATCH] Bug 9372 - Automatic carriage return in message_queue where content_type is html - Followup > >The patch for bug 9372 causes all whitespace to be stripped from a message. This is because >the $content variable was previously loaded with the content and then stripped of whitespace >to determine if the message had any text. The previous patch for 9372 then used the $content >variable as if it were the original unmodified content of the message. >--- > C4/Letters.pm | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 4f4acd9..4c77762 100644 >--- a/C4/Letters.pm >+++ b/C4/Letters.pm >@@ -700,8 +700,8 @@ sub EnqueueLetter { > } > if( $params->{'letter'}->{'content-type'} and ($params->{'letter'}->{'content-type'}=~/html/i )) > { >- $content=~s/\n/<br \/>/g; >- $content=~s/\r//g; >+ $params->{letter}->{content} =~ s/\n/<br \/>/g; >+ $params->{letter}->{content} =~ s/\r//g; > } > my $dbh = C4::Context->dbh(); > my $statement = << 'ENDSQL'; >@@ -715,7 +715,7 @@ ENDSQL > my $result = $sth->execute( > $params->{'borrowernumber'}, # borrowernumber > $params->{'letter'}->{'title'}, # subject >- $content, # content >+ $params->{letter}->{content}, # content > $params->{'letter'}->{'metadata'} || '', # metadata > $params->{'letter'}->{'code'} || '', # letter_code > $params->{'message_transport_type'}, # message_transport_type >-- >1.7.2.5
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 9372
:
14487
|
14488
|
14546
|
14547
|
14548
|
14549
|
20062
|
20071
|
21003