summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/template.pm
diff options
context:
space:
mode:
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 23:34:07 +0100
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>2008-07-14 23:34:07 +0100
commit18b3e970ffcc0f74d68538b7094f76442a294609 (patch)
tree7565862f3e2f86a1e9ff623d991f3150860230a4 /IkiWiki/Plugin/template.pm
parent23a3de5e8c4998c41afc99664fd4a7fe25e7bf29 (diff)
parent66053f6fc7b300c9b49a5c69d2c7a1eeec841743 (diff)
Merge commit 'origin/master' into aggregateinternal
Diffstat (limited to 'IkiWiki/Plugin/template.pm')
-rw-r--r--IkiWiki/Plugin/template.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index aa1f57c07..c33dbbb83 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -16,7 +16,7 @@ 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}";
@@ -42,7 +42,7 @@ sub preprocess (@) { #{{{
);
};
if ($@) {
- return "[[template ".gettext("failed to process:")." $@]]";
+ error gettext("failed to process:")." $@"
}
$params{basename}=IkiWiki::basename($params{page});