urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Assume that every page has been scanned by the time the scan phase ends" 

This reverts commit c04a26f3e7, which
turns out to break the templatebody directive: readtemplate() relies
on scan() populating %templates, but if scan() is a no-op after
leaving the scan phase, we can't rely on that.

The assumption made by skipping scan() after the end of the render phase
is that everything that comes from a scan is already in the index.
However, we don't really want to put template bodies in the index:
that would force us to load and save them on every refresh, and
redundantly persist them to disk.

Test-case:

% make clean
% ./Makefile.PL
% make
% grep -E '<div class="notebox">|Use this template to' html/sandbox.html
% touch doc/sandbox/New_blog_entry.mdwn          # sandbox inlines this
% make
% grep -E '<div class="notebox">|Use this template to' html/sandbox.html

Good result: html/sandbox.html contains <div class="notebox"> both times

Bad result: html/sandbox.html contains "Use this template to..." the
second time
master
Simon McVittie 2015-06-08 23:20:22 +01:00
parent 983d6b0976
commit 5fd863b5b0
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
IkiWiki/Render.pm
View File

@ -155,7 +155,7 @@ sub genpage ($$) {
sub scan ($) { sub scan ($) {
my $file=shift; my $file=shift;
return if $phase > PHASE_SCAN || $scanned{$file}; return if $scanned{$file};
$scanned{$file}=1; $scanned{$file}=1;
debug(sprintf(gettext("scanning %s"), $file)); debug(sprintf(gettext("scanning %s"), $file));
@ -886,9 +886,6 @@ sub refresh () {
# At this point it becomes OK to start matching pagespecs. # At this point it becomes OK to start matching pagespecs.
$phase = PHASE_RENDER; $phase = PHASE_RENDER;
# Save some memory: we no longer need to keep track of which pages
# we've scanned
%scanned = ();
remove_del(@$del, @$internal_del); remove_del(@$del, @$internal_del);