Fixes merge issues

This commit is contained in:
Shannon
2014-03-18 19:05:07 +11:00
parent 02481dcfba
commit 4d13925e3b
17 changed files with 42 additions and 39 deletions

View File

@@ -84,10 +84,12 @@ namespace Umbraco.Web.Install.InstallSteps
{
get
{
var provider = Core.Security.MembershipProviderExtensions.GetUsersMembershipProvider();
return new
{
minCharLength = Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName].MinRequiredPasswordLength,
minNonAlphaNumericLength = Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName].MinRequiredNonAlphanumericCharacters
minCharLength = provider.MinRequiredPasswordLength,
minNonAlphaNumericLength = provider.MinRequiredNonAlphanumericCharacters
};
}
}