X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/39056453424dcb7e01f69c502192e45604d1fe84..844169c9b06830df33ccde8abead015128baa496:/IkiWiki/Plugin/template.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index a2859b2a9..b6097bb49 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,24 +4,25 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use HTML::Template;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "template", call => \&getsetup);
-	hook(type => "preprocess", id => "template", call => \&preprocess);
-} # }}}
+	hook(type => "preprocess", id => "template", call => \&preprocess,
+		scan => 1);
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => undef,
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{id}) {
@@ -33,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;
@@ -68,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