From dae0f48e91304afcb6ebe0936360e51b22a56548 Mon Sep 17 00:00:00 2001 From: joey Date: Sat, 9 Sep 2006 22:50:27 +0000 Subject: * Work on firming up the plugin interface: - Plugins should not need to load IkiWiki::Render to get commonly used functions, so moved some functions from there to IkiWiki. - Picked out the set of functions and variables that most plugins use, documented them, and made IkiWiki export them by default, like a proper perl module should. - Use the other functions at your own risk. - This is not quite complete, I still have to decide whether to export some other things. * Changed all plugins included in ikiwiki to not use "IkiWiki::" when referring to stuff now exported by the IkiWiki module. * Anyone with a third-party ikiwiki plugin is strongly enrouraged to make like changes to it and avoid use of non-exported symboles from "IkiWiki::". * Link debian/changelog and debian/news to NEWS and CHANGELOG. * Support hyperestradier version 1.4.2, which adds a new required phraseform setting. --- IkiWiki/Plugin/template.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'IkiWiki/Plugin/template.pm') diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 7e23306cb..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, -- cgit v1.2.3