web commit by Justin

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 70d05d5a0fbe287946df41b120b16e4f87d02d31..9bf223cf000310463175c2cd579aaa9c603d9010 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::search;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
        hook(type => "getopt", id => "hyperestraier",
@@ -64,8 +64,9 @@ sub change (@) { #{{{
        debug(gettext("updating hyperestraier search index"));
        estcmd("gather -cm -bc -cl -sd",
                map {
-                       Encode::encode_utf8($config{destdir}."/".$_)
-                               foreach @{$renderedfiles{pagename($_)}};
+                       map {
+                               Encode::encode_utf8($config{destdir}."/".$_)
+                       } @{$renderedfiles{pagename($_)}};
                } @_
        );
        estcfg();
@@ -95,7 +96,7 @@ sub estcfg () { #{{{
        open(TEMPLATE, ">:utf8", $newfile) || error("open $newfile: $!", $cleanup);
        print TEMPLATE IkiWiki::misctemplate("search", 
                "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
-               baseurl => IkiWiki::dirname($config{cgiurl})."/") ||
+               forcebaseurl => IkiWiki::dirname($config{cgiurl})."/") ||
                        error("write $newfile: $!", $cleanup);
        close TEMPLATE || error("save $newfile: $!", $cleanup);
        rename($newfile, "$estdir/$cgi.tmpl") ||