Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 416762fe1fc8153205b8dd7bec7f06090a9e22ed..c980df48f4a48dfa8100fefa341740a2028244eb 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -9,14 +9,23 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
 use Encode;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "template", call => \&getsetup);

        hook(type => "preprocess", id => "template", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "template", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
 
        if (! exists $params{id}) {
 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}";
        }
 
        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"),
 
        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;
                        unless defined $template_file;
 
        my $template;


@@ -42,13 +51,15 @@ 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) {
                if ($template->query(name => $param)) {
                        $template->param($param =>
        foreach my $param (keys %params) {
                if ($template->query(name => $param)) {
                        $template->param($param =>

-                               IkiWiki::htmlize($params{page},
+                               IkiWiki::htmlize($params{page}, $params{destpage},

                                        pagetype($pagesources{$params{page}}),
                                        $params{$param}));
                }
                                        pagetype($pagesources{$params{page}}),
                                        $params{$param}));
                }