update

[git.ikiwiki.info.git] / IkiWiki / Plugin / template.pm

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 1b7eb91bf91e3761a5a0ee9ff2fd753b65f9bb71..b6097bb49d26133a54dc2fa27c3fc98e59d657bb 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -4,13 +4,14 @@ package IkiWiki::Plugin::template;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use HTML::Template;
 use Encode;
 
 sub import {
        hook(type => "getsetup", id => "template", call => \&getsetup);
 use HTML::Template;
 use Encode;
 
 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 () {


@@ -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},
        return IkiWiki::preprocess($params{page}, $params{destpage},
                IkiWiki::filter($params{page}, $params{destpage},

-               $template->output));
+               $template->output), $scan);

 }
 
 1
 }
 
 1