Revert the effects of find_del_files() for (re)autoadded files.

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

diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 57bff20ff32ba57ce3e19ff9c2e5ec5d01bcb927..39d9667f978982afe4314dc1f3751471b39f260f 100644 (file)
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -10,7 +10,8 @@ use Encode;
 
 sub import {
        hook(type => "getsetup", id => "template", call => \&getsetup);
 
 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 () {


@@ -24,6 +25,10 @@ sub getsetup () {
 sub preprocess (@) {
        my %params=@_;
 
 sub preprocess (@) {
        my %params=@_;
 

+       # This needs to run even in scan mode, in order to process
+       # links and other metadata included via the template.
+       my $scan=! defined wantarray;
+

        if (! exists $params{id}) {
                error gettext("missing id parameter")
        }
        if (! exists $params{id}) {
                error gettext("missing id parameter")
        }


@@ -57,20 +62,23 @@ sub preprocess (@) {
        $params{basename}=IkiWiki::basename($params{page});
 
        foreach my $param (keys %params) {
        $params{basename}=IkiWiki::basename($params{page});
 
        foreach my $param (keys %params) {

+               my $value=IkiWiki::preprocess($params{page}, $params{destpage},
+                         IkiWiki::filter($params{page}, $params{destpagea},
+                         $params{$param}), $scan);

                if ($template->query(name => $param)) {
                        $template->param($param =>
                                IkiWiki::htmlize($params{page}, $params{destpage},
                                        pagetype($pagesources{$params{page}}),
                if ($template->query(name => $param)) {
                        $template->param($param =>
                                IkiWiki::htmlize($params{page}, $params{destpage},
                                        pagetype($pagesources{$params{page}}),

-                                       $params{$param}));
+                                       $value));

                }
                if ($template->query(name => "raw_$param")) {
                }
                if ($template->query(name => "raw_$param")) {

-                       $template->param("raw_$param" => $params{$param});
+                       $template->param("raw_$param" => $value);

                }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},
                }
        }
 
        return IkiWiki::preprocess($params{page}, $params{destpage},

-               IkiWiki::filter($params{page}, $params{destpage},
-               $template->output));
+              IkiWiki::filter($params{page}, $params{destpage},
+              $template->output), $scan);

 }
 
 1
 }
 
 1