web commit by intrigeri: bug submission

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b169f7e75f23c1528c44ecbad00eb661d3df4d73..aa1f57c0703ebcea645bb8818ef779ffaa520d1c 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -45,12 +45,22 @@ sub preprocess (@) { #{{{
                return "[[template ".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},
-               IkiWiki::filter($params{page},
+               IkiWiki::filter($params{page}, $params{destpage},
                $template->output));
 } # }}}