@@ -, +, @@
---
koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 12 +++---------
opac/opac-search.pl | 1 +
2 files changed, 4 insertions(+), 9 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -253,15 +253,9 @@
[% ELSE %]
- [% IF ( opac_limit_override ) %]
- [% IF ( opac_search_limit ) %]
-
- [% END %]
- [% ELSE %]
- [% IF ( mylibraryfirst ) %]
-
- [% END %]
- [% END # / opac_limit_override %]
+ [% IF ( mylibraryfirst ) %]
+
+ [% END %]
[% END # / OpacAddMastheadLibraryPulldown %]
--- a/opac/opac-search.pl
+++ a/opac/opac-search.pl
@@ -470,6 +470,7 @@ if ($operands[0] && !$operands[1]) {
# limits are use to limit to results to a pre-defined category such as branch or language
my @limits = $cgi->multi_param('limit');
+push @limits, $ENV{OPAC_SEARCH_LIMIT} if ( $ENV{OPAC_SEARCH_LIMIT} and $ENV{OPAC_LIMIT_OVERRIDE} );
@limits = map { uri_unescape($_) } @limits;
my @nolimits = $cgi->multi_param('nolimit');
@nolimits = map { uri_unescape($_) } @nolimits;
--