X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f27bf9e4006c55b45624d6fbb47dc3c625f919b9..8cb0bdcc122b9244595825b81053dfaf54c55b51:/IkiWiki/Plugin/template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 7e23306cb..416762fe1 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,48 +4,62 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use HTML::Template;
 use Encode;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "template", 
-		call => \&preprocess);
+	hook(type => "preprocess", id => "template", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[template missing id parameter]]"
+		return "[[template ".gettext("missing id parameter")."]]";
 	}
 
 	my $template_page="templates/$params{id}";
-	IkiWiki::add_depends($params{page}, $template_page);
-
-	my $template_file=$IkiWiki::pagesources{$template_page};
-	return "[[template ".
-	       IkiWiki::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,
-	);
+	add_depends($params{page}, $template_page);
+
+	my $template_file=$pagesources{$template_page};
+	return sprintf(gettext("template %s not found"),
+		htmllink($params{page}, $params{destpage}, $template_page))
+			unless defined $template_file;
+
+	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 ".gettext("failed to process:")." $@]]";
+	}
 
 	foreach my $param (keys %params) {
-		$template->param($param => $params{$param});
+		if ($template->query(name => $param)) {
+			$template->param($param =>
+				IkiWiki::htmlize($params{page},
+					pagetype($pagesources{$params{page}}),
+					$params{$param}));
+		}
+		if ($template->query(name => "raw_$param")) {
+			$template->param("raw_$param" => $params{$param});
+		}
 	}
 
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-		$template->output);
+		IkiWiki::filter($params{page}, $params{destpage},
+		$template->output));
 } # }}}
 
 1