From 048dec04f278a166de98e7462c2a7cecfaf35292 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 22 Jun 2015 12:45:50 +0200 Subject: [PATCH] [PASSED QA] Bug 14431: FIX encoding issues in search (staff client) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note that this does not appears at the OPAC. We will need 2 different testers here, the results seem to depend on the Encode version. 0/ Determine your Encode version (`pmvers Encode`). If you have 2.60: 1) /cgi-bin/koha/catalogue/search.pl?q=ééé&op=Submit You should get " No results match your search for 'kw,wrdl: ���' in my library Catalog." 2) /cgi-bin/koha/catalogue/search.pl?q=ກ You should get Cannot decode string with wide characters at /usr/lib/i386-linux-gnu/perl/5.20/Encode.pm line 215. If you have <2.60 (? not sure here): 1) /cgi-bin/koha/catalogue/search.pl?q=ééé&op=Submit You should not get encoding problems. 2) /cgi-bin/koha/catalogue/search.pl?q=ກ You should not get encoding problems. Apply this patch, try again 1 and 2. If the Encode version is >=2.60, the encoding issues should be fixed. If not, please detail if there are any regression. NOTE: Tested on Ubuntu 14.04, Debian 8, and Debian 7. See comment #3. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall --- catalogue/search.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/catalogue/search.pl b/catalogue/search.pl index 006a1d4..1abacb6 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -414,7 +414,7 @@ if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) { } # an operand can be a single term, a phrase, or a complete ccl query -my @operands = map Encode::decode_utf8( uri_unescape($_) ), $cgi->param('q'); +my @operands = map uri_unescape($_), $cgi->param('q'); # limits are use to limit to results to a pre-defined category such as branch or language my @limits = map uri_unescape($_), $cgi->param('limit'); -- 1.7.2.5