From e402fdc1c5279f17e059fa1a62438a937c708c05 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. --- basket/sendbasket.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 3f57de2..4babbae 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -19,7 +19,7 @@ use strict; use warnings; use CGI; -use Encode qw(encode); +use Encode qw(decode encode); use Carp; use Mail::Sendmail; @@ -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(decode("UTF-8", $body))); } my $boundary = "====" . time() . "===="; -- 1.7.10.4