* Add getopt hook type, this allows plugins to add new command-line options.

[git.ikiwiki.info.git] / IkiWiki / Plugin / search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index c94974ac4b608bfbf122f4455a0fe3fc0fcc71a6..c79d4046954535ce340169cf9169b89c1e75ba6a 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -27,12 +27,14 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
-sub pagetemplate ($$) { #{{{
-       my $page=shift;
-       my $template=shift;
+sub pagetemplate (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       my $template=$params{template};
 
        # Add search box to page header.
-       $template->param(searchform => qq{
+       if ($template->query(name => "searchform")) {
+               $template->param(searchform => qq{
 <form method="get" action="$IkiWiki::config{cgiurl}" id="searchform">
 <div>
 <input type="text" name="phrase" value="" size="16" />
@@ -41,6 +43,7 @@ sub pagetemplate ($$) { #{{{
 </div>
 </form>
 });
+       }
 } #}}}
 
 sub delete (@) { #{{{
@@ -87,9 +90,7 @@ sub estcfg () { #{{{
        close TEMPLATE;
        open(TEMPLATE, ">$estdir/$cgi.conf") ||
                error("write $estdir/$cgi.conf: $!");
-       my $template=HTML::Template->new(
-               filename => "$config{templatedir}/estseek.conf"
-       );
+       my $template=template("estseek.conf");
        eval q{use Cwd 'abs_path'};
        $template->param(
                index => $estdir,