From ee8d237f98b2c82b441dc7c26f6ce8545362cb73 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 23 Apr 2010 14:50:00 -0400
Subject: improved error message

---
 IkiWiki/Plugin/inline.pm   | 7 ++++++-
 IkiWiki/Plugin/template.pm | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5d99c9da2..95fe90312 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -329,11 +329,16 @@ sub preprocess_inline (@) {
 	if (! $feedonly) {
 		my $template;
 		if (! $raw) {
+			# cannot use wiki pages as templates; template not sanitized due to
+			# format hook hack
 			eval {
 				$template=template_depends($params{template}.".tmpl", $params{page},
 					blind_cache => 1);
 			};
-			if ($@ || ! $template) {
+			if ($@) {
+				error gettext("failed to process template:")." $@";
+			}
+			if (! $template) {
 				error sprintf(gettext("template %s not found"), $params{template}.".tmpl");
 			}
 		}
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index fc8292010..e5a0c05c3 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -41,7 +41,7 @@ sub preprocess (@) {
 			blind_cache => 1);
 	};
 	if ($@) {
-		error gettext("failed to process:")." $@";
+		error gettext("failed to process template:")." $@";
 	}
 	if (! $template) {
 		error sprintf(gettext("%s not found"),
-- 
cgit v1.2.3