From: Joey Hess <joey@kitenet.net>
Date: Sat, 15 May 2010 01:42:48 +0000 (-0400)
Subject: avoid showing redundant search box on search results page
X-Git-Tag: 3.20100515~14
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=4c6fa6413fc26ddbb1f8dc2c73f97a105c5002f8

avoid showing redundant search box on search results page
---

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index cc26b7ac1..a9089620b 100644
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -228,7 +228,8 @@ sub setupfiles () {
 		
 		# Avoid omega interpreting anything in the misctemplate
 		# as an omegascript command.
-		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0");
+		my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0",
+			searching => 1);
 		eval q{use HTML::Entities};
 		error $@ if $@;
 		$misctemplate=encode_entities($misctemplate, '\$');
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f7944e40e..a7d200466 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -48,9 +48,11 @@
 </TMPL_IF>
 </span>
 </span>
+<TMPL_UNLESS SEARCHING>
 <TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF HAVE_ACTIONS>