Merge branch 'master' into autotag

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index c33dbbb83b8d1623ffd1348667247ec3be04f082..98a13b5fa55871b4d54d7f8fe1ee9599ff16e2d9 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,17 +4,32 @@ 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,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {
        my %params=@_;
 
+       # This needs to run even in scan mode, in order to process
+       # links and other metadata included via the template.
+       my $scan=! defined wantarray;
+
        if (! exists $params{id}) {
                error gettext("missing id parameter")
        }
@@ -22,9 +37,15 @@ sub preprocess (@) { #{{{
        my $template_page="templates/$params{id}";
        add_depends($params{page}, $template_page);
 
-       my $template_file=$pagesources{$template_page};
+       my $template_file;
+       if (exists $pagesources{$template_page}) {
+               $template_file=srcfile($pagesources{$template_page});
+       }
+       else {
+               $template_file=IkiWiki::template_file("$params{id}.tmpl")
+       }
        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;
@@ -35,7 +56,7 @@ sub preprocess (@) { #{{{
                                $$text_ref=&Encode::decode_utf8($$text_ref);
                                chomp $$text_ref;
                        },
-                       filename => srcfile($template_file),
+                       filename => $template_file,
                                die_on_bad_params => 0,
                        no_includes => 1,
                        blind_cache => 1,
@@ -48,20 +69,23 @@ sub preprocess (@) { #{{{
        $params{basename}=IkiWiki::basename($params{page});
 
        foreach my $param (keys %params) {
+               my $value=IkiWiki::preprocess($params{page}, $params{destpage},
+                         IkiWiki::filter($params{page}, $params{destpagea},
+                         $params{$param}), $scan);
                if ($template->query(name => $param)) {
                        $template->param($param =>
                                IkiWiki::htmlize($params{page}, $params{destpage},
                                        pagetype($pagesources{$params{page}}),
-                                       $params{$param}));
+                                       $value));
                }
                if ($template->query(name => "raw_$param")) {
-                       $template->param("raw_$param" => $params{$param});
+                       $template->param("raw_$param" => $value);
                }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
-               IkiWiki::filter($params{page}, $params{destpage},
-               $template->output));
-} # }}}
+              IkiWiki::filter($params{page}, $params{destpage},
+              $template->output), $scan);
+}
 
 1