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

oops, fix for no_chdir mode 

$_ will be absolute then
master
Joey Hess 2010-04-20 14:13:46 -04:00
parent cff3937b68
commit 1f56dead00
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/autoindex.pm
View File

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

7
IkiWiki/Plugin/comments.pm
View File

@ -644,13 +644,14 @@ sub comments_pending () {
find({
no_chdir => 1,
wanted => sub {
$_=decode_utf8($_);
my $file=decode_utf8($_);
$file=~s/^\Q$dir\E\/?//;
return unless length $file;
if (IkiWiki::file_pruned($_)) {
$File::Find::prune=1;
}
elsif (! -l $_ && ! -d _) {
$File::Find::prune=0;
my ($f)=/$config{wiki_file_regexp}/; # untaint
my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
if (defined $f && $f =~ /\Q._comment\E$/) {
my $ctime=(stat($f))[10];
push @ret, [$f, $ctime];