X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d442f1b2fc4389f1da49d3b632359a377a6e825e..a4dc0f997c2d64c21e08d06382b9f3c3987a681f:/IkiWiki/Plugin/search.pm

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 70d05d5a0..9bf223cf0 100644
--- 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") ||