diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 13:50:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-21 13:50:49 -0400 |
| commit | 587e0c3d21dfbde052e0fd71a7ed0e33e09e757f (patch) | |
| tree | b47f72305880c28db47bc268afd4ffbc6bdf953e | |
| parent | 39f8071aacf9913304d907694002e2e5294aa987 (diff) | |
| download | ikiwiki-587e0c3d21dfbde052e0fd71a7ed0e33e09e757f.tar ikiwiki-587e0c3d21dfbde052e0fd71a7ed0e33e09e757f.tar.gz | |
Fix a bug introduced in the last version that caused ikiwiki to skip all files if a sourcedir of "./" was specified.
| -rw-r--r-- | IkiWiki/Render.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0fe20c64f..0889fed62 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -287,13 +287,13 @@ sub find_src_files () { wanted => sub { my $file=decode_utf8($_); $file=~s/^\Q$config{srcdir}\E\/?//; + return if -l $_ || -d _ || ! length $file; my $page = pagename($file); if (! exists $pagesources{$page} && file_pruned($file)) { $File::Find::prune=1; return; } - return if -l $_ || -d _ || ! length $file; my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint if (! defined $f) { @@ -314,13 +314,13 @@ sub find_src_files () { wanted => sub { my $file=decode_utf8($_); $file=~s/^\Q$dir\E\/?//; + return if -l $_ || -d _ || ! length $file; my $page=pagename($file); if (! exists $pagesources{$page} && file_pruned($file)) { $File::Find::prune=1; return; } - return if -l $_ || -d _ || ! length $file; my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint if (! defined $f) { diff --git a/debian/changelog b/debian/changelog index 95dc8c6b2..f6739952e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes). * edittemplate: Work around bug #551499 in CGI::FormBuilder. + * Fix a bug introduced in the last version that caused ikiwiki + to skip all files if a sourcedir of "./" was specified. -- Joey Hess <joeyh@debian.org> Sun, 18 Oct 2009 13:44:09 -0400 |