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

(-)a/C4/Auth.pm (-3 / +3 lines)
Lines 554-562 sub get_template_and_user { Link Here
554
        my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
554
        my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'};
555
        my $opac_name           = '';
555
        my $opac_name           = '';
556
        if (
556
        if (
557
            ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:([\w-]+)/ ) ||
557
            ( $opac_limit_override && $opac_search_limit && $opac_search_limit =~ /^branch:([\w-]+)/ ) ||
558
            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:([\w-]+)/ ) ||
558
            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /^branch:([\w-]+)/ ) ||
559
            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /multibranchlimit:(\w+)/ )
559
            ( $in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /^multibranchlimit:(\w+)/ )
560
          ) {
560
          ) {
561
            $opac_name = $1;    # opac_search_limit is a branch, so we use it.
561
            $opac_name = $1;    # opac_search_limit is a branch, so we use it.
562
        } elsif ( $in->{'query'}->param('multibranchlimit') ) {
562
        } elsif ( $in->{'query'}->param('multibranchlimit') ) {
(-)a/catalogue/search.pl (-2 / +1 lines)
Lines 243-249 my @search_groups = Link Here
243
243
244
my $branch_limit = '';
244
my $branch_limit = '';
245
my $limit_param = $cgi->param('limit');
245
my $limit_param = $cgi->param('limit');
246
if ( $limit_param and $limit_param =~ /branch:([\w-]+)/ ) {
246
if ( $limit_param and $limit_param =~ /^branch:([\w-]+)/ ) {
247
    $branch_limit = $1;
247
    $branch_limit = $1;
248
}
248
}
249
249
250
- 

Return to bug 37244