From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 18:06:00 +0000 (-0400)
Subject: switch to 1 parameter version of file_pruned
X-Git-Tag: 3.20100427~93^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d063a6698ad72476d9243956b0f13ec33a09dbd;p=ikiwiki.git

switch to 1 parameter version of file_pruned

Another bit of code that didn't realize that File::Find sets $_ to the
relative filename.
---

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index c71d73349..1d0612e84 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -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;