From 3ae27debbc4de1429cff8dbd26d9f55d8071cefa Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Mon, 8 Aug 2016 01:15:23 +0200
Subject: [PATCH] Bug 17074: Follow-up: fixing encoding issues with multiple
 search terms

If there was more than one search term you could see that that it
was url encoded. Also problems with search terms with umlauts and
other diacritics.

Patch should fix that.

https://bugs.koha-community.org/show_bug.cgi?id=17074
Signed-off-by: Marc <veron@veron.ch>
---
 catalogue/search.pl                                          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 41f67aa..77c982d 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -504,7 +504,7 @@ for my $this_cgi ( split('&',$query_cgi) ) {
         $scan_index_to_use = $input_value; # unless $scan_index_to_use;
     }
     if ($input_name eq 'q') {
-        $scan_search_term_to_use = $input_value;
+        $scan_search_term_to_use = Encode::decode_utf8( uri_unescape( $input_value ));
     }
 }
 $template->param ( QUERY_INPUTS => \@query_inputs,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 55b5927..64c0bee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -422,7 +422,7 @@ var holdForPatron = function () {
                 <tr>
                     <td>
                         [% IF ( scan_search_term_to_use ) %]
-                            Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use %]" />
+                            Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use | html %]" />
                         [% ELSE %]
                             Scan Index for: <input type="text" name="q" id="scan-index" size="35" value="" />
                         [% END %]
-- 
2.1.4