Fix bug in wikiname sanitisation in the setup automator.

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index f6eb00f7085ed4421667b6b9e43b03c476b1fe63..a54b53817bfbbf726d26ce298fdc8b4eb2a4479f 100644 (file)
--- 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.
        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)");
        }
        if (! length $config{wikiname}) {
                error gettext("you must enter a wikiname (that contains alphanumerics)");
        }

diff --git a/debian/changelog b/debian/changelog
index 6f19153e0f43c17a5cd526b8d238c15f107e8116..050698e72735772052f00d58874afd3aa52d776c 100644 (file)
--- 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.
   * 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
 
 
  -- Joey Hess <joeyh@debian.org>  Thu, 21 Aug 2008 16:20:58 -0400