From e79420813e402ac91fb31a8abf8156b6f3fcb4fd Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 12 Mar 2015 21:01:52 +1300
Subject: [PATCH] Revert "Bug 13789 - facets with accented utf-8 characters
 generate double encoded links"

This reverts commit 0029619eb3838eb372eca87b8eb3e6ca1a3a4629.
---
 catalogue/search.pl                                |  5 +++--
 .../intranet-tmpl/prog/en/includes/facets.inc      | 14 +++++++-------
 .../bootstrap/en/includes/opac-facets.inc          | 11 +++++++----
 opac/opac-search.pl                                |  3 ++-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index b9c73ae467..24abcb0963 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -519,7 +519,7 @@ for my $this_cgi ( split('&',$limit_cgi) ) {
     my $input_name = $1;
     my $input_value = $2;
     $input_name =~ s/=$//;
-    push @limit_inputs, { input_name => $input_name, input_value => Encode::decode_utf8( uri_unescape($input_value) ) };
+    push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
 }
 $template->param ( LIMIT_INPUTS => \@limit_inputs );
 
@@ -723,11 +723,12 @@ my $gotopage = $cgi->param('gotoPage');
 $template->{'VARS'}->{'gotoPage'} = $gotopage
   if $gotopage =~ m/^(ISBD|labeledMARC|MARC|more)?detail.pl$/;
 
+my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
 for my $facet ( @$facets ) {
     for my $entry ( @{ $facet->{facets} } ) {
         my $index = $entry->{type_link_value};
         my $value = $entry->{facet_link_value};
-        $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
+        $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
     }
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index 7d4e56efee..6a6ba0576e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -23,14 +23,17 @@
 <ul>
   [% FOREACH facet IN facets_loo.facets %]
     <li>
-      [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
+      [% SET query_cgi_f = query_cgi | html %]
+      [% SET limit_cgi_f = limit_cgi | html %]
+      [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi_f _ limit_cgi_f %]
       [% IF ( sort_by ) %]
-        [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
+        [% SET url = url _ "&amp;sort_by=" _ sort_by %]
       [% END %]
+      [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
       [% IF facet.active %]
         [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
         <span class="facet-label">[% facet.facet_label_value %]</span>
-        [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
+        [<a href="[% url |url%]" title="Remove facet [% facet.facet_title_value | html %]">x</a>]
       [% ELSE %]
         [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
         <span class="facet-label"><a href="[% url |url%]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
@@ -41,10 +44,7 @@
     </li>
   [% END %]
   [% IF ( facets_loo.expandable ) %]
-      <li class="showmore">
-          <a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi %][% limit_cgi |url %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF ( offset ) %]
-                  &amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
-      </li>
+    <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url%][% END %][% IF ( offset ) %]&amp;offset=[% offset %][% END %]&amp;expand=[% facets_loo.expand %]#[% facets_loo.type_id %]">Show more</a></li>
   [% END %]
 </ul></li>
 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
index cd60e8221a..e1b69a5abb 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -32,17 +32,20 @@
                         <ul>
                             [% FOREACH facet IN facets_loo.facets %]
                                 <li>
-                                  [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %]
+                                  [% SET query_cgi_f = query_cgi | url %]
+                                  [% SET limit_cgi_f = limit_cgi | url %]
+                                  [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi_f _ limit_cgi_f %]
                                   [% IF ( sort_by ) %]
-                                    [% url = BLOCK %][% url %][% "&amp;sort_by=" _ sort_by |url %][% END %]
+                                    [% SET url = url _ "&amp;sort_by=" _ sort_by |url %]
                                   [% END %]
+                                  [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
                                   [% IF facet.active %]
                                     [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
                                     <span class="facet-label">[% facet.facet_label_value %]</span>
-                                    [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
+                                    [<a href="[% url |url%]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
                                   [% ELSE %]
                                     [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
-                                    <span class="facet-label"><a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
+                                    <span class="facet-label"><a href="[% url |url%]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a></span>
                                     [% IF ( displayFacetCount ) %]
                                       <span class="facet-count"> ([% facet.facet_count %])</span>
                                     [% END %]
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index daa38f6106..692d70b938 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -872,11 +872,12 @@ for (my $i=0;$i<@servers;$i++) {
 } #/end of the for loop
 #$template->param(FEDERATED_RESULTS => \@results_array);
 
+my @input_values = map { Encode::decode_utf8($_->{input_value}) } @limit_inputs;
 for my $facet ( @$facets ) {
     for my $entry ( @{ $facet->{facets} } ) {
         my $index = $entry->{type_link_value};
         my $value = $entry->{facet_link_value};
-        $entry->{active} = grep { $_->{input_value} eq qq{$index:$value} } @limit_inputs;
+        $entry->{active} = grep { $_ eq qq{$index:$value} } @input_values;
     }
 }
 
-- 
2.39.5