diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-15 03:15:34 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-09-15 03:15:34 +0000 |
| commit | 96b395705a97de3c481f223804a818816947353f (patch) | |
| tree | 0f47341822fb61e7acba36e1cb7558c5ce50a084 | |
| parent | 8b69dcfcdf24914eb432dbec48c0aa478e680b81 (diff) | |
| download | ikiwiki-96b395705a97de3c481f223804a818816947353f.tar ikiwiki-96b395705a97de3c481f223804a818816947353f.tar.gz | |
* Fix a baseurl problem in hyperestradier search results.
| -rw-r--r-- | IkiWiki.pm | 5 | ||||
| -rw-r--r-- | IkiWiki/Plugin/search.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index a3f907770..6484e8cb0 100644 --- 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 75004b201..4ae9d7283 100644 --- 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 a18dd76d1..bb9ca1350 100644 --- 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 |