aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-04 20:26:17 -0400
committerJoey Hess <joey@kitenet.net>2010-05-04 20:26:17 -0400
commitd0a5945000164327bfa649f5213b897b31839aee (patch)
tree5cc8e496804fed83a88416f4dfe4d7e44810e1ad
parent76a5dbe7cbc4e1f016752e4aa1445052c0b4a3ef (diff)
downloadikiwiki-d0a5945000164327bfa649f5213b897b31839aee.tar
ikiwiki-d0a5945000164327bfa649f5213b897b31839aee.tar.gz
Fixes a bug in skipping of illegal source files introduced in 3.20100427.
-rw-r--r--IkiWiki/Render.pm1
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 0 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index a824ba539..e5ba0079b 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -321,6 +321,7 @@ sub find_src_files () {
my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
if (! defined $f) {
warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+ return;
}
if ($underlay) {
diff --git a/debian/changelog b/debian/changelog
index 31deaf9aa..049a3a898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
are kept separate for now to avoid breaking modified templates.)
* websetup: Only display Setup button on admins' preferences page.
* graphviz: Fix display of preexisting images in preview mode.
+ * Fixes a bug in skipping of illegal source files introduced in
+ 3.20100427.
-- Joey Hess <joeyh@debian.org> Sun, 02 May 2010 13:22:50 -0400