aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-21 23:40:11 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-21 23:40:11 -0400
commit6cf96b581974b3e59af3289196c4687c2416f35c (patch)
tree30f08115c64fb443e549a549b8e75e16f7bf0888
parent15ed67132ee70a3c9c98565dee464a8f968c765c (diff)
downloadikiwiki-6cf96b581974b3e59af3289196c4687c2416f35c.tar
ikiwiki-6cf96b581974b3e59af3289196c4687c2416f35c.tar.gz
Fix bug in wikiname sanitisation in the setup automator.
-rw-r--r--IkiWiki/Setup/Automator.pm2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index f6eb00f70..a54b53817 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -28,7 +28,7 @@ sub import (@) { #{{{
IkiWiki::Setup::merge({@_});
# Sanitize this to avoid problimatic directory names.
- $config{wikiname}=~s/[^-A-Za-z0-9_] //g;
+ $config{wikiname}=~s/[^-A-Za-z0-9_]//g;
if (! length $config{wikiname}) {
error gettext("you must enter a wikiname (that contains alphanumerics)");
}
diff --git a/debian/changelog b/debian/changelog
index 6f19153e0..050698e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ikiwiki (2.62) UNRELEASED; urgency=low
* Avoid using cp -a (again). (HenrikBrixAndersen)
* Avoid using hostname -f for portability to eg, OS X, use Net::Domain
instead, and prompt if it fails.
+ * Fix bug in wikiname sanitisation in the setup automator.
-- Joey Hess <joeyh@debian.org> Thu, 21 Aug 2008 16:20:58 -0400