Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 09570560420e649a5e1a1e3f588f146f28aa5579..c33dbbb83b8d1623ffd1348667247ec3be04f082 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use HTML::Template;
 use Encode;
 
@@ -16,17 +16,16 @@ sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
-               return "[[template missing id parameter]]"
+               error gettext("missing id parameter")
        }
 
        my $template_page="templates/$params{id}";
        add_depends($params{page}, $template_page);
 
        my $template_file=$pagesources{$template_page};
-       return "[[template ".
-              htmllink($params{page}, $params{destpage}, $template_page).
-              " not found]]"
-               unless defined $template_file;
+       return sprintf(gettext("template %s not found"),
+               htmllink($params{page}, $params{destpage}, $template_page))
+                       unless defined $template_file;
 
        my $template;
        eval {
@@ -43,15 +42,26 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
-               return "[[template failed to process: $@]]";
+               error gettext("failed to process:")." $@"
        }
 
+       $params{basename}=IkiWiki::basename($params{page});
+
        foreach my $param (keys %params) {
-               $template->param($param => $params{$param});
+               if ($template->query(name => $param)) {
+                       $template->param($param =>
+                               IkiWiki::htmlize($params{page}, $params{destpage},
+                                       pagetype($pagesources{$params{page}}),
+                                       $params{$param}));
+               }
+               if ($template->query(name => "raw_$param")) {
+                       $template->param("raw_$param" => $params{$param});
+               }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
-               $template->output);
+               IkiWiki::filter($params{page}, $params{destpage},
+               $template->output));
 } # }}}
 
 1