X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/57ff2ecaeddb3e802fbec50acd7bf286941ec000..35460e3153286381a6019e5afd46b2880a95cb88:/IkiWiki/Plugin/template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 416762fe1..b6097bb49 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,19 +4,29 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
-	hook(type => "preprocess", id => "template", call => \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "template", call => \&getsetup);
+	hook(type => "preprocess", id => "template", call => \&preprocess,
+		scan => 1);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{id}) {
-		return "[[template ".gettext("missing id parameter")."]]";
+		error gettext("missing id parameter")
 	}
 
 	my $template_page="templates/$params{id}";
@@ -24,7 +34,7 @@ sub preprocess (@) { #{{{
 
 	my $template_file=$pagesources{$template_page};
 	return sprintf(gettext("template %s not found"),
-		htmllink($params{page}, $params{destpage}, $template_page))
+		htmllink($params{page}, $params{destpage}, "/".$template_page))
 			unless defined $template_file;
 
 	my $template;
@@ -42,13 +52,15 @@ sub preprocess (@) { #{{{
 		);
 	};
 	if ($@) {
-		return "[[template ".gettext("failed to process:")." $@]]";
+		error gettext("failed to process:")." $@"
 	}
 
+	$params{basename}=IkiWiki::basename($params{page});
+
 	foreach my $param (keys %params) {
 		if ($template->query(name => $param)) {
 			$template->param($param =>
-				IkiWiki::htmlize($params{page},
+				IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
 					$params{$param}));
 		}
@@ -57,9 +69,13 @@ sub preprocess (@) { #{{{
 		}
 	}
 
+	# This needs to run even in scan mode, in order to process
+	# links and other metadata includes via the template.
+	my $scan=! defined wantarray;
+
 	return IkiWiki::preprocess($params{page}, $params{destpage},
 		IkiWiki::filter($params{page}, $params{destpage},
-		$template->output));
-} # }}}
+		$template->output), $scan);
+}
 
 1