summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-05 23:44:20 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-11-05 23:44:20 +0000
commit3a3219c0e034cb2ca246774eea64c5c8b9dc5d07 (patch)
tree5f45d68c6ed13bcdc655e34462934b94d586f9ed /IkiWiki/Plugin
parentb78e93098b29a9fbefde840e2cddc34c5e3f9745 (diff)
* Avoid syntax errors in templates used by the template plugin crashing
ikiwiki.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/template.pm28
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});