urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch to 1 parameter version of file_pruned 

Another bit of code that didn't realize that File::Find sets $_ to the
relative filename.
master
Joey Hess 2010-04-20 14:06:00 -04:00
parent 230a8b22a4
commit 6d063a6698
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/autoindex.pm
View File

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