Previous change hid global search on results page too, fixing.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 78180e3..04a041f 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -11,7 +11,7 @@
 <div id="fluid">
 <div id="fluid-offset">
 <div id="fluid-content-1">
-    <!-- TMPL_UNLESS NAME="itemtypeloop" --><form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+    <!-- TMPL_UNLESS NAME="advsearch" --><form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
        <label for="masthead_search"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
        <select name="idx" id="masthead_search">
        <!-- TMPL_IF NAME="ms_kw" -->

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 62fe01c..0f2fc2f 100755 (executable)
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -145,6 +145,7 @@ if ( $template_type eq 'advsearch' ) {
 
     }
     $template->param(uc(C4::Context->preference("marcflavour")) => 1,
+                                         advsearch => 1,
                       search_boxes_loop => \@search_boxes_array);
 
 # use the global setting by default