Merge branch 'master' of git://git.madduck.net/code/ikiwiki

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

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 61e9214e62a70dff8f86f58dfd26e2b2ffe0306f..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 warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "getopt", id => "hyperestraier",
 
 sub import { #{{{
        hook(type => "getopt", id => "hyperestraier",


@@ -96,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",
        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") ||
                        error("write $newfile: $!", $cleanup);
        close TEMPLATE || error("save $newfile: $!", $cleanup);
        rename($newfile, "$estdir/$cgi.tmpl") ||