aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-04-20 14:06:00 -0400
committerJoey Hess <joey@kitenet.net>2010-04-20 14:06:00 -0400
commit6d063a6698ad72476d9243956b0f13ec33a09dbd (patch)
tree306fb5d6396145b2ffafc31b874f21b594dba5a7
parent230a8b22a471c018c8ec48cd07427c42238a4970 (diff)
downloadikiwiki-6d063a6698ad72476d9243956b0f13ec33a09dbd.tar
ikiwiki-6d063a6698ad72476d9243956b0f13ec33a09dbd.tar.gz
switch to 1 parameter version of file_pruned
Another bit of code that didn't realize that File::Find sets $_ to the relative filename.
-rw-r--r--IkiWiki/Plugin/autoindex.pm4
1 files changed, 1 insertions, 3 deletions
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;