cosmetics patch from Recai

[ikiwiki.git] / IkiWiki / Plugin / template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 5b4eeb3a8f66f609f42a6a2f13df0e138c00540f..09570560420e649a5e1a1e3f588f146f28aa5579 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -9,8 +9,7 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "template", 
-               call => \&preprocess);
+       hook(type => "preprocess", id => "template", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -21,30 +20,36 @@ sub preprocess (@) { #{{{
        }
 
        my $template_page="templates/$params{id}";
-       IkiWiki::add_depends($params{page}, $template_page);
+       add_depends($params{page}, $template_page);
 
-       my $template_file=$IkiWiki::pagesources{$template_page};
+       my $template_file=$pagesources{$template_page};
        return "[[template ".
-              IkiWiki::htmllink($params{page}, $params{destpage}, $template_page).
+              htmllink($params{page}, $params{destpage}, $template_page).
               " not found]]"
                unless defined $template_file;
 
-       my $template=HTML::Template->new(
-               filter => sub {
-                        my $text_ref = shift;
-                        $$text_ref=&Encode::decode_utf8($$text_ref);
-                },
-                filename => IkiWiki::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});
        }
 
-
        return IkiWiki::preprocess($params{page}, $params{destpage},
                $template->output);
 } # }}}