X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9d7375c3b263e77da29a5db22af480db8b99d990..efecdae0914773b224b76a4247e1aaf3fd24ee0e:/IkiWiki/Plugin/template.pm diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 5b4eeb3a8..1a4faf05f 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -9,8 +9,7 @@ use HTML::Template; use Encode; sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "template", - call => \&preprocess); + hook(type => "preprocess", id => "template", call => \&preprocess); } # }}} sub preprocess (@) { #{{{ @@ -21,11 +20,11 @@ sub preprocess (@) { #{{{ } my $template_page="templates/$params{id}"; - IkiWiki::add_depends($params{page}, $template_page); + add_depends($params{page}, $template_page); - my $template_file=$IkiWiki::pagesources{$template_page}; + my $template_file=$pagesources{$template_page}; return "[[template ". - IkiWiki::htmllink($params{page}, $params{destpage}, $template_page). + htmllink($params{page}, $params{destpage}, $template_page). " not found]]" unless defined $template_file; @@ -34,7 +33,7 @@ sub preprocess (@) { #{{{ my $text_ref = shift; $$text_ref=&Encode::decode_utf8($$text_ref); }, - filename => IkiWiki::srcfile($template_file), + filename => srcfile($template_file), die_on_bad_params => 0, no_includes => 1, blind_cache => 1, @@ -44,7 +43,6 @@ sub preprocess (@) { #{{{ $template->param($param => $params{$param}); } - return IkiWiki::preprocess($params{page}, $params{destpage}, $template->output); } # }}}