View | Details | Raw Unified | Return to bug 10857
Collapse All | Expand All

(-)a/C4/Search.pm (-2 / +2 lines)
Lines 1549-1555 sub buildQuery { Link Here
1549
            $group_OR_limits{$k} .= " or " if $group_OR_limits{$k};
1549
            $group_OR_limits{$k} .= " or " if $group_OR_limits{$k};
1550
            $limit_desc      .= " or " if $group_OR_limits{$k};
1550
            $limit_desc      .= " or " if $group_OR_limits{$k};
1551
            $group_OR_limits{$k} .= "$this_limit";
1551
            $group_OR_limits{$k} .= "$this_limit";
1552
            $limit_cgi       .= "&limit=$this_limit";
1552
            $limit_cgi       .= "&limit=" . uri_escape($this_limit);
1553
            $limit_desc      .= " $this_limit";
1553
            $limit_desc      .= " $this_limit";
1554
        }
1554
        }
1555
1555
Lines 1557-1563 sub buildQuery { Link Here
1557
        else {
1557
        else {
1558
            $limit .= " and " if $limit || $query;
1558
            $limit .= " and " if $limit || $query;
1559
            $limit      .= "$this_limit";
1559
            $limit      .= "$this_limit";
1560
            $limit_cgi  .= "&limit=$this_limit";
1560
            $limit_cgi  .= "&limit=" . uri_escape($this_limit);
1561
            if ($this_limit =~ /^branch:(.+)/) {
1561
            if ($this_limit =~ /^branch:(.+)/) {
1562
                my $branchcode = $1;
1562
                my $branchcode = $1;
1563
                my $branchname = GetBranchName($branchcode);
1563
                my $branchname = GetBranchName($branchcode);
(-)a/catalogue/search.pl (-1 / +3 lines)
Lines 153-158 use POSIX qw(ceil floor); Link Here
153
use String::Random;
153
use String::Random;
154
use C4::Branch; # GetBranches
154
use C4::Branch; # GetBranches
155
155
156
use URI::Escape;
157
156
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
158
my $DisplayMultiPlaceHold = C4::Context->preference("DisplayMultiPlaceHold");
157
# create a new CGI object
159
# create a new CGI object
158
# FIXME: no_undef_params needs to be tested
160
# FIXME: no_undef_params needs to be tested
Lines 512-518 for my $this_cgi ( split('&',$limit_cgi) ) { Link Here
512
    my $input_name = $1;
514
    my $input_name = $1;
513
    my $input_value = $2;
515
    my $input_value = $2;
514
    $input_name =~ s/=$//;
516
    $input_name =~ s/=$//;
515
    push @limit_inputs, { input_name => $input_name, input_value => $input_value };
517
    push @limit_inputs, { input_name => $input_name, input_value => uri_unescape($input_value) };
516
}
518
}
517
$template->param ( LIMIT_INPUTS => \@limit_inputs );
519
$template->param ( LIMIT_INPUTS => \@limit_inputs );
518
520
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (-2 / +3 lines)
Lines 28-40 Link Here
28
      [% IF ( sort_by ) %]
28
      [% IF ( sort_by ) %]
29
        [% SET url = url _ "&sort_by=" _ sort_by %]
29
        [% SET url = url _ "&sort_by=" _ sort_by %]
30
      [% END %]
30
      [% END %]
31
      [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
31
      [% IF facet.active %]
32
      [% IF facet.active %]
32
        [% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
33
        [% SET url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
33
        [% facet.facet_label_value %]
34
        [% facet.facet_label_value %]
34
        [<a href="[% url |url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
35
        [<a href="[% url %]" title="Remove facet [% facet.facet_title_value | html %]">x</a>]
35
      [% ELSE %]
36
      [% ELSE %]
36
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
37
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
37
        <a href="[% url | url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a>
38
        <a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a>
38
        [% IF ( displayFacetCount ) %]
39
        [% IF ( displayFacetCount ) %]
39
          ([% facet.facet_count %])
40
          ([% facet.facet_count %])
40
        [% END %]
41
        [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc (-2 / +3 lines)
Lines 29-41 Link Here
29
      [% IF ( sort_by ) %]
29
      [% IF ( sort_by ) %]
30
        [% SET url = url _ "&amp;sort_by=" _ sort_by |html %]
30
        [% SET url = url _ "&amp;sort_by=" _ sort_by |html %]
31
      [% END %]
31
      [% END %]
32
      [% facet.facet_link_value = BLOCK %][% facet.facet_link_value | uri %][% END %]
32
      [% IF facet.active %]
33
      [% IF facet.active %]
33
        [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
34
        [% SET url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
34
        [% facet.facet_label_value %]
35
        [% facet.facet_label_value %]
35
        [<a href="[% url |url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
36
        [<a href="[% url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
36
      [% ELSE %]
37
      [% ELSE %]
37
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
38
        [% SET url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
38
        <a href="[% url | url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a>
39
        <a href="[% url %]" title="[% facet.facet_title_value |html %]">[% facet.facet_label_value %]</a>
39
        [% IF ( displayFacetCount ) %]
40
        [% IF ( displayFacetCount ) %]
40
          ([% facet.facet_count %])
41
          ([% facet.facet_count %])
41
        [% END %]
42
        [% END %]
(-)a/opac/opac-search.pl (-2 / +1 lines)
Lines 456-462 sub _input_cgi_parse { Link Here
456
    for my $this_cgi ( split('&',shift) ) {
456
    for my $this_cgi ( split('&',shift) ) {
457
        next unless $this_cgi;
457
        next unless $this_cgi;
458
        $this_cgi =~ /(.*?)=(.*)/;
458
        $this_cgi =~ /(.*?)=(.*)/;
459
        push @elements, { input_name => $1, input_value => $2 };
459
        push @elements, { input_name => $1, input_value => uri_unescape($2) };
460
    }
460
    }
461
    return @elements;
461
    return @elements;
462
}
462
}
463
- 

Return to bug 10857