From 01a39d6ce0b9fe2153434a9cb2802126ce39b2df Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 14 Nov 2013 11:31:23 +0100
Subject: [PATCH] Bug 10605: fix encoding issue on basket email (INTRANET)

Same fix for the staff interface.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
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 <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 62fcbea10a0e7b3fbca74531ec5051704ab63f7c)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
(cherry picked from commit 6d16356a1a5bf08c83b7e00dbbfa84ae3bf3d02b)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 basket/sendbasket.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl
index 3f57de2d14..885ee41a78 100755
--- a/basket/sendbasket.pl
+++ b/basket/sendbasket.pl
@@ -131,8 +131,9 @@ if ( $email_add ) {
     }
 
     if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
-        $body = encode_qp($1);
+        $body = $1;
         $body =~ s|\n?(.*)\n?|$1|;
+        $body = encode("UTF-8", encode_qp($body));
     }
 
     my $boundary = "====" . time() . "====";
-- 
2.39.5