* Avoid syntax errors in templates used by the template plugin crashing

  ikiwiki.

1 files changed, 17 insertions, 11 deletions

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 3d088289d..095705604 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -28,17 +28,23 @@ sub preprocess (@) { #{{{
 	       " not found]]"
 		unless defined $template_file;
 
-	my $template=HTML::Template->new(
-        	filter => sub {
-                        my $text_ref = shift;
-                        $$text_ref=&Encode::decode_utf8($$text_ref);
-			chomp $$text_ref;
-                },
-                filename => srcfile($template_file),
-                die_on_bad_params => 0,
-		no_includes => 1,
-		blind_cache => 1,
-	);
+	my $template;
+	eval {
+		$template=HTML::Template->new(
+	        	filter => sub {
+	                        my $text_ref = shift;
+	                        $$text_ref=&Encode::decode_utf8($$text_ref);
+				chomp $$text_ref;
+	                },
+	                filename => srcfile($template_file),
+       			die_on_bad_params => 0,
+			no_includes => 1,
+			blind_cache => 1,
+		);
+	};
+	if ($@) {
+		return "[[template failed to process: $@]]";
+	}
 
 	foreach my $param (keys %params) {
 		$template->param($param => $params{$param});