* Fix a baseurl problem in hyperestradier search results.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a3f907770cdd69ff3664785911088d0620995b80..6484e8cb0370782bed6182665566779c0215a4cf 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -591,7 +591,7 @@ sub template ($;@) { #{{{
        HTML::Template->new(template_params(@_));
 } #}}}
 
-sub misctemplate ($$) { #{{{
+sub misctemplate ($$;@) { #{{{
        my $title=shift;
        my $pagebody=shift;
        
@@ -601,7 +601,8 @@ sub misctemplate ($$) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                pagebody => $pagebody,
-       baseurl => baseurl(),
+               baseurl => baseurl(),
+               @_,
        );
        return $template->output;
 }#}}}

diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm
index 75004b2018fef4520b3cd4c2a2a02017cd83719e..4ae9d7283f14779e2ea3271ade41fb96b2698a8d 100644 (file)
--- a/IkiWiki/Plugin/search.pm
+++ b/IkiWiki/Plugin/search.pm
@@ -82,7 +82,8 @@ sub estcfg () { #{{{
        open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
                error("write $estdir/$cgi.tmpl: $!");
        print TEMPLATE IkiWiki::misctemplate("search", 
-               "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n");
+               "<!--ESTFORM-->\n\n<!--ESTRESULT-->\n\n<!--ESTINFO-->\n\n",
+               baseurl => IkiWiki::dirname($config{cgiurl})."/");
        close TEMPLATE;
        open(TEMPLATE, ">$estdir/$cgi.conf") ||
                error("write $estdir/$cgi.conf: $!");

diff --git a/debian/changelog b/debian/changelog
index a18dd76d146952c7ceba915195a9d61c419776ef..bb9ca13501ef6ff95e452da19cea178affa79c72 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,9 @@ ikiwiki (1.27) UNRELEASED; urgency=low
   * Patch from Recai to kill utf-8 on the wiki name when generating the
     session cookie.
   * Change ddate plugin to use the DateTime::Calendar::Discordian perl module.
+  * Fix a baseurl problem in hyperestradier search results.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 14 Sep 2006 18:25:27 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 14 Sep 2006 23:05:02 -0400
 
 ikiwiki (1.26) unstable; urgency=low