X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3a3219c0e034cb2ca246774eea64c5c8b9dc5d07..52bbdbb1a5ce994c9afac253c1d9bfd94acf4d1d:/IkiWiki/Plugin/template.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 095705604..c33dbbb83 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use HTML::Template;
 use Encode;
 
@@ -16,17 +16,16 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[template missing id parameter]]"
+		error gettext("missing id parameter")
 	}
 
 	my $template_page="templates/$params{id}";
 	add_depends($params{page}, $template_page);
 
 	my $template_file=$pagesources{$template_page};
-	return "[[template ".
-	       htmllink($params{page}, $params{destpage}, $template_page).
-	       " not found]]"
-		unless defined $template_file;
+	return sprintf(gettext("template %s not found"),
+		htmllink($params{page}, $params{destpage}, $template_page))
+			unless defined $template_file;
 
 	my $template;
 	eval {
@@ -43,15 +42,26 @@ sub preprocess (@) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[template failed to process: $@]]";
+		error gettext("failed to process:")." $@"
 	}
 
+	$params{basename}=IkiWiki::basename($params{page});
+
 	foreach my $param (keys %params) {
-		$template->param($param => $params{$param});
+		if ($template->query(name => $param)) {
+			$template->param($param =>
+				IkiWiki::htmlize($params{page}, $params{destpage},
+					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