From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 14 Nov 2013 10:31:23 +0000 (+0100)
Subject: Bug 10605: fix encoding issue on basket email (INTRANET)
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=62fcbea10a0e7b3fbca74531ec5051704ab63f7c;p=koha.git

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>
---

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() . "====";