inline: Fix display of all pages when archive=yes or show=0 are used.

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f3a0939d7dde93107e7b0285e883e2a2..ab3a71671455874a0b8032bfd8d09f5b362339aa 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
        my $page=shift;
        my $content=shift;
+       
+       run_hooks(postscan => sub {
+               shift->(page => $page, content => $content);
+       });
 
        my $templatefile;
        run_hooks(templatefile => sub {
@@ -130,10 +134,6 @@ sub genpage ($$) {
        
        $content=$template->output;
        
-       run_hooks(postscan => sub {
-               shift->(page => $page, content => $content);
-       });
-
        run_hooks(format => sub {
                $content=shift->(
                        page => $page,
@@ -287,13 +287,13 @@ sub find_src_files () {
                wanted => sub {
                        my $file=decode_utf8($_);
                        $file=~s/^\Q$config{srcdir}\E\/?//;
+                       return if -l $_ || -d _ || ! length $file;
                        my $page = pagename($file);
                        if (! exists $pagesources{$page} &&
                            file_pruned($file)) {
                                $File::Find::prune=1;
                                return;
                        }
-                       return if -l $_ || -d _ || ! length $file;
 
                        my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                        if (! defined $f) {
@@ -314,13 +314,13 @@ sub find_src_files () {
                        wanted => sub {
                                my $file=decode_utf8($_);
                                $file=~s/^\Q$dir\E\/?//;
+                               return if -l $_ || -d _ || ! length $file;
                                my $page=pagename($file);
                                if (! exists $pagesources{$page} &&
                                    file_pruned($file)) {
                                        $File::Find::prune=1;
                                        return;
                                }
-                               return if -l $_ || -d _ || ! length $file;
 
                                my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
                                if (! defined $f) {