use htmlpage a couple of places instead of hardcoding the extension

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 94b37ca06ef034ea93445da6f27a21ef033ef127..751c75ab566e7849721ba987e2347d9bc62bb05d 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.
 
        # 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" />
 <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>
 });
 </div>
 </form>
 });

+       }

 } #}}}
 
 sub delete (@) { #{{{
 } #}}}
 
 sub delete (@) { #{{{


@@ -53,7 +56,7 @@ sub change (@) { #{{{
        IkiWiki::debug("updating hyperestraier search index");
        IkiWiki::estcmd("gather -cm -bc -cl -sd",
                map {
        IkiWiki::debug("updating hyperestraier search index");
        IkiWiki::estcmd("gather -cm -bc -cl -sd",
                map {

-                       $IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)}
+                       Encode::encode_utf8($IkiWiki::config{destdir}."/".$IkiWiki::renderedfiles{IkiWiki::pagename($_)})

                } @_
        );
        IkiWiki::estcfg();
                } @_
        );
        IkiWiki::estcfg();