web commit by JoshTriplett: Remove <ikiroot> placeholder, and make absolute image...

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 23d9d65d88835c12f81ea27134221965f89754dc..690443558e71788e616f13575008cdfbffc09c3d 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 "[[".gettext("template missing id parameter")."]]";
+               return "[[template ".gettext("missing id parameter")."]]";

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


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

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

        }
 
        foreach my $param (keys %params) {
        }
 
        foreach my $param (keys %params) {


@@ -50,7 +50,8 @@ sub preprocess (@) { #{{{
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},

-               $template->output);
+               IkiWiki::filter($params{page},
+               $template->output));

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