X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1..89e0de5bc46f87231a3447acb8609641cc9162aa:/IkiWiki/Plugin/template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 16a3c1e37..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,7 +16,7 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[".gettext("template missing id parameter")."]]";
+		error gettext("missing id parameter")
 	}
 
 	my $template_page="templates/$params{id}";
@@ -42,15 +42,25 @@ sub preprocess (@) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[".gettext("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},
-		IkiWiki::filter($params{page},
+		IkiWiki::filter($params{page}, $params{destpage},
 		$template->output));
 } # }}}