Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 27e475ae5339971027fd821f9ef2a9c36f7ec3fa..a6e34fcc9935546fca9cf0bbf136abee3887af42 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -46,13 +46,20 @@ sub preprocess (@) { #{{{
        }
 
        foreach my $param (keys %params) {
        }
 
        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::htmlize($params{page}, pagetype($pagesources{$params{page}}),
-               IkiWiki::preprocess($params{page}, $params{destpage},
+       return IkiWiki::preprocess($params{page}, $params{destpage},

                IkiWiki::filter($params{page}, $params{destpage},
                IkiWiki::filter($params{page}, $params{destpage},

-               $template->output)));
+               $template->output));

 } # }}}
 
 1
 } # }}}
 
 1