]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/template.pm
Merge commit 'upstream/master' into pub/master
[git.ikiwiki.info.git] / IkiWiki / Plugin / template.pm
index 27e475ae5339971027fd821f9ef2a9c36f7ec3fa..c980df48f4a48dfa8100fefa341740a2028244eb 100644 (file)
@@ -9,14 +9,23 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "template", call => \&getsetup);
        hook(type => "preprocess", id => "template", call => \&preprocess);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
-               return "[[template ".gettext("missing id parameter")."]]";
+               error gettext("missing id parameter")
        }
 
        my $template_page="templates/$params{id}";
@@ -24,7 +33,7 @@ sub preprocess (@) { #{{{
 
        my $template_file=$pagesources{$template_page};
        return sprintf(gettext("template %s not found"),
-               htmllink($params{page}, $params{destpage}, $template_page))
+               htmllink($params{page}, $params{destpage}, "/".$template_page))
                        unless defined $template_file;
 
        my $template;
@@ -42,17 +51,26 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
-               return "[[template ".gettext("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::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},
-               $template->output)));
+               $template->output));
 } # }}}
 
 1