summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/template.pm6
-rw-r--r--debian/changelog2
2 files changed, 7 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b872f0962..b6097bb49 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -69,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
diff --git a/debian/changelog b/debian/changelog
index e5d522200..95d414bc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.07) UNRELEASED; urgency=low
* wmd: New plugin contributed by William Uther to support the WMD
Wysiwym markdown editor.
* smiley: Avoid infinite loop in smiley expansion. Closes: #518805
+ * template: When loading a template in scan mode, let preprocess
+ know it only needs to scan.
-- Joey Hess <joeyh@debian.org> Thu, 05 Mar 2009 15:43:02 -0500