* Patch from hb to fix the pagestats plugin, which was broken by a past

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 600318e687498c4c98889e698e36481b74c53164..37383384d619c02d32dcb99ab49b284f61977331 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -46,7 +46,7 @@ sub backlinks ($) { #{{{
        }
        @links = sort { $a->{page} cmp $b->{page} } @links;
 
-       return \@links, [] if @links <= $config{numbacklinks} && ! $config{numbacklinks};
+       return \@links, [] if @links <= $config{numbacklinks} || ! $config{numbacklinks};
        return [@links[0..$config{numbacklinks}-1]],
               [@links[$config{numbacklinks}..$#links]];
 } #}}}
@@ -318,8 +318,8 @@ sub refresh () { #{{{
                }
        }
 
-       # scan changed and new files
-       my @changed;
+       # find changed and new files
+       my @needsbuild;
        foreach my $file (@files) {
                my $page=pagename($file);
                
@@ -327,16 +327,19 @@ sub refresh () { #{{{
                if (! exists $pagemtime{$page} ||
                    $mtime > $pagemtime{$page} ||
                    $forcerebuild{$page}) {
-                       debug(sprintf(gettext("scanning %s"), $file));
-                       $pagemtime{$page}=$mtime;
-                       push @changed, $file;
-                       scan($file);
+                       $pagemtime{$page}=$mtime;
+                       push @needsbuild, $file;
                }
        }
-       calculate_backlinks();
+       run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
-       # render changed and new pages
-       foreach my $file (@changed) {
+       # scan and rendder files
+       foreach my $file (@needsbuild) {
+               debug(sprintf(gettext("scanning %s"), $file));
+               scan($file);
+       }
+       calculate_backlinks();
+       foreach my $file (@needsbuild) {
                debug(sprintf(gettext("rendering %s"), $file));
                render($file);
                $rendered{$file}=1;
@@ -365,7 +368,7 @@ sub refresh () { #{{{
                                foreach my $file (keys %rendered, @del) {
                                        next if $f eq $file;
                                        my $page=pagename($file);
-                                       if (pagespec_match($page, $depends{$p}, $p)) {
+                                       if (pagespec_match($page, $depends{$p}, location => $p)) {
                                                debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
                                                render($f);
                                                $rendered{$f}=1;