From 270187404e87bdae985e70a590834ed2dc5d49c7 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 18 Aug 2015 18:40:31 +0100
Subject: [PATCH] Bug 14584: Encoding broken with system preferences
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The pref are double encoded.

From bug 12411:
"This will fix the encoding issues existing in 3.14 and 3.16.
The issue still appear in master but is fixed by bug 11944."

They should not have been pushed together.

Test plan:
1) You need an accentuated language installed.
2) Go to NoLoginInstructions pref, and add some accentuated message like
"Hélo médames é mècieüx"
3) refresh opac home page, message should be gibberish
4) apply patch.  Message should be ok now.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Works as expected.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 813a047e236947a815c4be3c3dde38f19844b962)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 Koha/Template/Plugin/Koha.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Koha/Template/Plugin/Koha.pm b/Koha/Template/Plugin/Koha.pm
index ecb6266257..86f9e77ec0 100644
--- a/Koha/Template/Plugin/Koha.pm
+++ b/Koha/Template/Plugin/Koha.pm
@@ -18,7 +18,6 @@ package Koha::Template::Plugin::Koha;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Encode qw( encode );
 
 use base qw( Template::Plugin );
 
@@ -43,7 +42,7 @@ is necessary.
 
 sub Preference {
     my ( $self, $pref ) = @_;
-    return encode('UTF-8', C4::Context->preference( $pref ) );
+    return C4::Context->preference( $pref );
 }
 
 sub Version {
-- 
2.39.5