Fix a bug introduced in the last version that caused ikiwiki to skip all files if...

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f3a0939d7dde93107e7b0285e883e2a2..0889fed6218aa79e551b3656c2a93ba9607c9d69 100644 (file)
--- 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 95dc8c6b2a72495d5fccc05b1fd48a61bc4f0b89..f6739952ea8f83df36c23b7bba2925d05c3d4ca8 100644 (file)
--- 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