Fix bug in wikiname sanitisation in the setup automator.

master
Joey Hess 2008-08-21 23:40:11 -04:00
parent 15ed67132e
commit 6cf96b5819
2 changed files with 2 additions and 1 deletions

View File

@ -28,7 +28,7 @@ sub import (@) { #{{{
IkiWiki::Setup::merge({@_}); IkiWiki::Setup::merge({@_});
# Sanitize this to avoid problimatic directory names. # 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}) { if (! length $config{wikiname}) {
error gettext("you must enter a wikiname (that contains alphanumerics)"); error gettext("you must enter a wikiname (that contains alphanumerics)");
} }

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ ikiwiki (2.62) UNRELEASED; urgency=low
* Avoid using cp -a (again). (HenrikBrixAndersen) * Avoid using cp -a (again). (HenrikBrixAndersen)
* Avoid using hostname -f for portability to eg, OS X, use Net::Domain * Avoid using hostname -f for portability to eg, OS X, use Net::Domain
instead, and prompt if it fails. 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 -- Joey Hess <joeyh@debian.org> Thu, 21 Aug 2008 16:20:58 -0400