Merge commit 'schmonz/master' into cvs

[ikiwiki.git] / IkiWiki / Plugin / template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index aa1f57c0703ebcea645bb8818ef779ffaa520d1c..b6097bb49d26133a54dc2fa27c3fc98e59d657bb 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,19 +4,29 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
-       hook(type => "preprocess", id => "template", call => \&preprocess);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "template", call => \&getsetup);
+       hook(type => "preprocess", id => "template", call => \&preprocess,
+               scan => 1);
+}
 
-sub 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 +34,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,7 +52,7 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
-               return "[[template ".gettext("failed to process:")." $@]]";
+               error gettext("failed to process:")." $@"
        }
 
        $params{basename}=IkiWiki::basename($params{page});
@@ -59,9 +69,13 @@ sub preprocess (@) { #{{{
                }
        }
 
+       # This needs to run even in scan mode, in order to process
+       # links and other metadata includes via the template.
+       my $scan=! defined wantarray;
+
        return IkiWiki::preprocess($params{page}, $params{destpage},
                IkiWiki::filter($params{page}, $params{destpage},
-               $template->output));
-} # }}}
+               $template->output), $scan);
+}
 
 1