* Htmlize parameters passed to the template preprocessor directive before

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 23d9d65d88835c12f81ea27134221965f89754dc..27e475ae5339971027fd821f9ef2a9c36f7ec3fa 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,7 +16,7 @@ sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
-               return "[[".gettext("template missing id parameter")."]]";
+               return "[[template ".gettext("missing id parameter")."]]";
        }
 
        my $template_page="templates/$params{id}";
@@ -42,15 +42,17 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
-               return "[[".gettext("template failed to process:")." $@]]";
+               return "[[template ".gettext("failed to process:")." $@]]";
        }
 
        foreach my $param (keys %params) {
                $template->param($param => $params{$param});
        }
 
-       return IkiWiki::preprocess($params{page}, $params{destpage},
-               $template->output);
+       return IkiWiki::htmlize($params{page}, pagetype($pagesources{$params{page}}),
+               IkiWiki::preprocess($params{page}, $params{destpage},
+               IkiWiki::filter($params{page}, $params{destpage},
+               $template->output)));
 } # }}}
 
 1