img: Support a title attribute, will be passed through to html. Closes: #478718

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 16a3c1e37e49f406861b1b2526ba2898b2ff92fd..416762fe1fc8153205b8dd7bec7f06090a9e22ed 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,23 @@ 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});
+               if ($template->query(name => $param)) {
+                       $template->param($param =>
+                               IkiWiki::htmlize($params{page},
+                                       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},
-               IkiWiki::filter($params{page},
+               IkiWiki::filter($params{page}, $params{destpage},
                $template->output));
 } # }}}