formatting etc

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 76c1cd42aed37b24ff3f313a50c0d49cd4112aa7..d1716a31564031813e7d9f273ab7ff3ca02f3f5c 100644 (file)
--- 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 "" 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})) {
        }
        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};
        }
 
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};


@@ -108,7 +108,9 @@ sub filltemplate ($$) { #{{{
                );
        };
        if ($@) {
                );
        };
        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);
        }
 
        $template->param(name => $page);