From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 18:13:46 +0000 (-0400)
Subject: oops, fix for no_chdir mode
X-Git-Tag: 3.20100427~93^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f56dead00ee1188d9ed9650b9b2483b69c4d525;p=ikiwiki.git

oops, fix for no_chdir mode

$_ will be absolute then
---

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 1d0612e84..23a17d4e9 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -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 _) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 32e4d0937..03ca19c98 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -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];