From 6d6d580cc9169bc84b94904cacd02d153ebf7fc1 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 14 Nov 2013 11:31:23 +0100 Subject: [PATCH] Bug 10605: Encoding issue on sending a basket (INTRANET) Same fix for the staff interface. Signed-off-by: Katrin Fischer Both patches tested with English and German, diacritics now appear correctly if UTF-8 is selected as encoding. Passes all tests and QA script. Signed-off-by: Brendan Gallagher --- basket/sendbasket.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 3f57de2..885ee41 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -131,8 +131,9 @@ if ( $email_add ) { } if ( $template_res =~ /(.*)/s ) { - $body = encode_qp($1); + $body = $1; $body =~ s|\n?(.*)\n?|$1|; + $body = encode("UTF-8", encode_qp($body)); } my $boundary = "====" . time() . "===="; -- 1.7.10.4