formatting etc

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 27e475ae5339971027fd821f9ef2a9c36f7ec3fa..c33dbbb83b8d1623ffd1348667247ec3be04f082 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -16,7 +16,7 @@ sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
        my %params=@_;
 
        if (! exists $params{id}) {

-               return "[[template ".gettext("missing id parameter")."]]";
+               error gettext("missing id parameter")

        }
 
        my $template_page="templates/$params{id}";
        }
 
        my $template_page="templates/$params{id}";


@@ -42,17 +42,26 @@ sub preprocess (@) { #{{{
                );
        };
        if ($@) {
                );
        };
        if ($@) {

-               return "[[template ".gettext("failed to process:")." $@]]";
+               error gettext("failed to process:")." $@"

        }
 
        }
 

+       $params{basename}=IkiWiki::basename($params{page});
+

        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