When loading a template in scan mode, let preprocess know it only needs to scan.
This makes wikis such as zack's much faster in the scan pass. In that pass, when a template contains an inline, there is no reason to process the entire inline and all its pages. I'd forgotten to pass along the flag to let preprocess() know it was in scan mode, leading to much unncessary churning.master
parent
d3b4c2dbd1
commit
dd2fa2efb9
|
@ -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},
|
return IkiWiki::preprocess($params{page}, $params{destpage},
|
||||||
IkiWiki::filter($params{page}, $params{destpage},
|
IkiWiki::filter($params{page}, $params{destpage},
|
||||||
$template->output));
|
$template->output), $scan);
|
||||||
}
|
}
|
||||||
|
|
||||||
1
|
1
|
||||||
|
|
|
@ -5,6 +5,8 @@ ikiwiki (3.07) UNRELEASED; urgency=low
|
||||||
* wmd: New plugin contributed by William Uther to support the WMD
|
* wmd: New plugin contributed by William Uther to support the WMD
|
||||||
Wysiwym markdown editor.
|
Wysiwym markdown editor.
|
||||||
* smiley: Avoid infinite loop in smiley expansion. Closes: #518805
|
* 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
|
-- Joey Hess <joeyh@debian.org> Thu, 05 Mar 2009 15:43:02 -0500
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue