From 224dcb65852dac58d53ccdf44ac6dd89a35f8d93 Mon Sep 17 00:00:00 2001 From: Admin User Koha Date: Wed, 9 Jan 2013 12:35:27 +0100 Subject: [PATCH] Bug 9372 : replace \n with
for html messages in message_queue Signed-off-by: Kyle M Hall --- C4/Letters.pm | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 6d5e458..a9cab4f 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -684,7 +684,12 @@ sub EnqueueLetter ($) { } ); } - + my $content = $params->{'letter'}->{'content'}; + 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 @@ -697,7 +702,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