From 6be9524c2d5db79a64bb6c5c7b3d27e90913b64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Delaune?= Date: Wed, 9 Jan 2013 12:35:34 +0100 Subject: [PATCH] Bug 9372 : replace \n with
for html messages in message_queue Signed-off-by: Kyle M Hall --- C4/Letters.pm | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 36e6213..4f4acd9 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -698,7 +698,11 @@ sub EnqueueLetter { } ); } - + if( $params->{'letter'}->{'content-type'} and ($params->{'letter'}->{'content-type'}=~/html/i )) + { + $content=~s/\n/
/g; + $content=~s/\r//g; + } my $dbh = C4::Context->dbh(); my $statement = << 'ENDSQL'; INSERT INTO message_queue @@ -711,7 +715,7 @@ ENDSQL my $result = $sth->execute( $params->{'borrowernumber'}, # borrowernumber $params->{'letter'}->{'title'}, # subject - $params->{'letter'}->{'content'}, # content + $content, # content $params->{'letter'}->{'metadata'} || '', # metadata $params->{'letter'}->{'code'} || '', # letter_code $params->{'message_transport_type'}, # message_transport_type -- 1.7.2.5