Merge remote-tracking branch 'remotes/smcv/ready/careful-eval'

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index db26bfe315a254ddc8bdafef07abf83c4a819deb..ccc9cb6664e5617c514ba6715107a2c4d1ddc448 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -41,12 +41,11 @@ sub preprocess (@) {
                        blind_cache => 1);
        };
        if ($@) {
-               error gettext("failed to process template:")." $@";
-       }
-       if (! $template) {
-               error sprintf(gettext("%s not found"),
+               # gettext can clobber $@
+               my $error = $@;
+               error sprintf(gettext("failed to process template %s"),
                        htmllink($params{page}, $params{destpage},
-                               "/templates/$params{id}"))
+                               "/templates/$params{id}"))." $error";
        }
 
        $params{basename}=IkiWiki::basename($params{page});