* 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 3d088289de667f00651739be80268ba6316a51fe..09570560420e649a5e1a1e3f588f146f28aa5579 100644 (file)
--- 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 2c59130435d0fbbeaa6aac589d1ded7f1c14202c..0422c78b00eeaf2b4eff111f926eecab1a5f69c6 100644 (file)
--- 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