From 90c0be40823534d86eec479e5cdffa480bc7f5a3 Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Sat, 28 Nov 2009 13:50:22 +0000 Subject: [PATCH] Fixed and closed #422: hyphens and underscores are now allowed by default in usernames and group names. --- AssemblyVersion.cs | 4 ++-- Core/Settings.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index e1cc5d5..8dcf681 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.1.435")] -[assembly: AssemblyFileVersion("3.0.1.435")] +[assembly: AssemblyVersion("3.0.1.436")] +[assembly: AssemblyFileVersion("3.0.1.436")] diff --git a/Core/Settings.cs b/Core/Settings.cs index d97186d..0388091 100644 --- a/Core/Settings.cs +++ b/Core/Settings.cs @@ -1145,7 +1145,7 @@ namespace ScrewTurn.Wiki { /// public static string UsernameRegex { get { - return GetString(Provider.GetSetting("UsernameRegex"), @"^\w[\w\ !$@%^\.\(\)]{3,25}$"); + return GetString(Provider.GetSetting("UsernameRegex"), @"^\w[\w\ !$@%^\.\(\)\-_]{3,25}$"); } set { Provider.SetSetting("UsernameRegex", value); @@ -1157,7 +1157,7 @@ namespace ScrewTurn.Wiki { /// public static string PasswordRegex { get { - return GetString(Provider.GetSetting("PasswordRegex"), @"^\w[\w~!@#$%^\(\)\[\]\{\}\.,=\-_\ ]{6,25}$"); + return GetString(Provider.GetSetting("PasswordRegex"), @"^\w[\w~!@#$%^\(\)\[\]\{\}\.,=\-_\ ]{5,25}$"); } set { Provider.SetSetting("PasswordRegex", value);