urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a baseurl problem in hyperestradier search results.

master
joey 2006-09-15 03:15:34 +00:00
parent 8b69dcfcdf
commit 96b395705a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki.pm
View File

@ -591,7 +591,7 @@ sub template ($;@) { #{{{
HTML::Template->new(template_params(@_)); HTML::Template->new(template_params(@_));
} #}}} } #}}}
sub misctemplate ($$) { #{{{ sub misctemplate ($$;@) { #{{{
my $title=shift; my $title=shift;
my $pagebody=shift; my $pagebody=shift;
@ -601,7 +601,8 @@ sub misctemplate ($$) { #{{{
indexlink => indexlink(), indexlink => indexlink(),
wikiname => $config{wikiname}, wikiname => $config{wikiname},
pagebody => $pagebody, pagebody => $pagebody,
baseurl => baseurl(), baseurl => baseurl(),
@_,
); );
return $template->output; return $template->output;
}#}}} }#}}}

3
IkiWiki/Plugin/search.pm
View File

@ -82,7 +82,8 @@ sub estcfg () { #{{{
open(TEMPLATE, ">$estdir/$cgi.tmpl") || open(TEMPLATE, ">$estdir/$cgi.tmpl") ||
error("write $estdir/$cgi.tmpl: $!"); error("write $estdir/$cgi.tmpl: $!");
print TEMPLATE IkiWiki::misctemplate("search", 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; close TEMPLATE;
open(TEMPLATE, ">$estdir/$cgi.conf") || open(TEMPLATE, ">$estdir/$cgi.conf") ||
error("write $estdir/$cgi.conf: $!"); error("write $estdir/$cgi.conf: $!");

3
debian/changelog vendored
View File

@ -28,8 +28,9 @@ ikiwiki (1.27) UNRELEASED; urgency=low
* Patch from Recai to kill utf-8 on the wiki name when generating the * Patch from Recai to kill utf-8 on the wiki name when generating the
session cookie. session cookie.
* Change ddate plugin to use the DateTime::Calendar::Discordian perl module. * 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 ikiwiki (1.26) unstable; urgency=low