X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/cad753baf9b25ddd8e4cb5454766fce1cdc4217a..09d7cab02f5989522b51c43eccef43177512fbf1:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 9e93534c6..825c077da 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -154,7 +154,7 @@ sub genpage ($$) {
 
 sub scan ($) {
 	my $file=shift;
-	return if $scanned{$file};
+	return if $phase > PHASE_SCAN || $scanned{$file};
 	$scanned{$file}=1;
 
 	debug(sprintf(gettext("scanning %s"), $file));
@@ -827,6 +827,8 @@ sub gen_autofile ($$$) {
 }
 
 sub refresh () {
+	$phase = PHASE_SCAN;
+
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
 	my ($files, $pages, $new, $internal_new, $del, $internal_del, $changed, $internal_changed);
@@ -878,7 +880,13 @@ sub refresh () {
 	}
 
 	calculate_links();
-	
+
+	# At this point it becomes OK to start matching pagespecs.
+	$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);
 
 	foreach my $file (@$changed) {
@@ -942,6 +950,10 @@ sub commandline_render () {
 	loadindex();
 	unlockwiki();
 
+	# This function behaves as though it's in the render phase;
+	# all other files are assumed to have been scanned last time.
+	$phase = PHASE_RENDER;
+
 	my $srcfile=possibly_foolish_untaint($config{render});
 	my $file=$srcfile;
 	$file=~s/\Q$config{srcdir}\E\/?//;