X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1dddec0ba9f66f082f4b8349916cdb6bdb5636e3..603a0ce99c03db9d2a812864f60f16fca60c8673:/IkiWiki/Plugin/template.pm diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index a6e34fcc9..c980df48f 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -9,14 +9,23 @@ use HTML::Template; use Encode; sub import { #{{{ + hook(type => "getsetup", id => "template", call => \&getsetup); hook(type => "preprocess", id => "template", call => \&preprocess); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + sub preprocess (@) { #{{{ my %params=@_; if (! exists $params{id}) { - return "[[template ".gettext("missing id parameter")."]]"; + error gettext("missing id parameter") } my $template_page="templates/$params{id}"; @@ -24,7 +33,7 @@ sub preprocess (@) { #{{{ my $template_file=$pagesources{$template_page}; return sprintf(gettext("template %s not found"), - htmllink($params{page}, $params{destpage}, $template_page)) + htmllink($params{page}, $params{destpage}, "/".$template_page)) unless defined $template_file; my $template; @@ -42,9 +51,11 @@ sub preprocess (@) { #{{{ ); }; if ($@) { - return "[[template ".gettext("failed to process:")." $@]]"; + error gettext("failed to process:")." $@" } + $params{basename}=IkiWiki::basename($params{page}); + foreach my $param (keys %params) { if ($template->query(name => $param)) { $template->param($param =>