switch to 1 parameter version of file_pruned
authorJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 18:06:00 +0000 (14:06 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 20 Apr 2010 18:06:00 +0000 (14:06 -0400)
Another bit of code that didn't realize that File::Find sets $_ to the
relative filename.

IkiWiki/Plugin/autoindex.pm

index c71d73349c091021ab1d8083292fbd8888ce7d82..1d0612e846e87e3738aea2bf945c258609bb3496 100644 (file)
@@ -40,14 +40,12 @@ sub refresh () {
                        no_chdir => 1,
                        wanted => sub {
                                $_=decode_utf8($_);
-                               if (IkiWiki::file_pruned($_, $dir)) {
+                               if (IkiWiki::file_pruned($_)) {
                                        $File::Find::prune=1;
                                }
                                elsif (! -l $_) {
                                        my ($f)=/$config{wiki_file_regexp}/; # untaint
                                        return unless defined $f;
-                                       $f=~s/^\Q$dir\E\/?//;
-                                       return unless length $f;
                                        return if $f =~ /\._([^.]+)$/; # skip internal page
                                        if (! -d _) {
                                                $pages{pagename($f)}=1;