diff options
author | Simon McVittie <smcv@carbon.pseudorandom.co.uk> | 2008-07-14 23:34:07 +0100 |
---|---|---|
committer | Simon McVittie <smcv@carbon.pseudorandom.co.uk> | 2008-07-14 23:34:07 +0100 |
commit | 18b3e970ffcc0f74d68538b7094f76442a294609 (patch) | |
tree | 7565862f3e2f86a1e9ff623d991f3150860230a4 /IkiWiki/Plugin/edittemplate.pm | |
parent | 23a3de5e8c4998c41afc99664fd4a7fe25e7bf29 (diff) | |
parent | 66053f6fc7b300c9b49a5c69d2c7a1eeec841743 (diff) |
Merge commit 'origin/master' into aggregateinternal
Diffstat (limited to 'IkiWiki/Plugin/edittemplate.pm')
-rw-r--r-- | IkiWiki/Plugin/edittemplate.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 76c1cd42a..d1716a315 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -38,10 +38,10 @@ sub preprocess (@) { #{{{ return "" if $params{page} ne $params{destpage}; if (! exists $params{template} || ! length($params{template})) { - return "[[meta ".gettext("template not specified")."]]"; + error gettext("template not specified") } if (! exists $params{match} || ! length($params{match})) { - return "[[meta ".gettext("match not specified")."]]"; + error gettext("match not specified") } $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template}; @@ -108,7 +108,9 @@ sub filltemplate ($$) { #{{{ ); }; if ($@) { - return "[[pagetemplate ".gettext("failed to process")." $@]]"; + # Indicate that the earlier preprocessor directive set + # up a template that doesn't work. + return "[[!pagetemplate ".gettext("failed to process")." $@]]"; } $template->param(name => $page); |