From ed68deb617dac3fc7cd0301f967a6df21bc64ffd Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 28 Aug 2013 16:00:37 +0100 Subject: [PATCH] Bug 10798 - OPAC_SEARCH_LIMIT behaves badly with search groups Since the addition of search groups to koha, the branch limiting parameter in multiple PAC by URL support should also support limiting by these search groups. This patch adds this ability. Signed-off-by: Srdjan --- C4/Auth.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index d73edaf..f165d5e 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -380,7 +380,11 @@ sub get_template_and_user { my $opac_search_limit = $ENV{'OPAC_SEARCH_LIMIT'}; my $opac_limit_override = $ENV{'OPAC_LIMIT_OVERRIDE'}; my $opac_name = ''; - if (($opac_search_limit && $opac_search_limit =~ /branch:(\w+)/ && $opac_limit_override) || ($in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/)){ + if ( + ($opac_limit_override && $opac_search_limit && $opac_search_limit =~ /branch:(\w+)/) || + ($in->{'query'}->param('limit') && $in->{'query'}->param('limit') =~ /branch:(\w+)/) || + ($in->{'query'}->param('multibranchlimit') && $in->{'query'}->param('multibranchlimit') =~ /multibranchlimit-(\w+)/) + ) { $opac_name = $1; # opac_search_limit is a branch, so we use it. } elsif ( $in->{'query'}->param('multibranchlimit') ) { $opac_name = $in->{'query'}->param('multibranchlimit'); -- 1.7.9.5