From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sun, 5 Nov 2006 23:44:20 +0000 (+0000)
Subject: * Avoid syntax errors in templates used by the template plugin crashing
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/3a3219c0e034cb2ca246774eea64c5c8b9dc5d07?hp=b78e93098b29a9fbefde840e2cddc34c5e3f9745

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

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});
diff --git a/debian/changelog b/debian/changelog
index 2c5913043..0422c78b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ikiwiki (1.33) UNRELEASED; urgency=low
 
   * Fix issue with aggregate plugin updating expired pages.
+  * Avoid syntax errors in templates used by the template plugin crashing
+    ikiwiki.
 
- -- Joey Hess <joeyh@debian.org>  Sat,  4 Nov 2006 14:19:47 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun,  5 Nov 2006 18:41:06 -0500
 
 ikiwiki (1.32) unstable; urgency=low