yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.

Browse Source
This commit is contained in:
Shannon
2013-09-25 19:23:41 +10:00
parent f356b94c39
commit 1e9a17babe
125 changed files with 397 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Security/WebSecurity.cs
View File

@@ -177,7 +177,7 @@ namespace Umbraco.Web.Security
/// <returns></returns>
internal bool ValidateBackOfficeCredentials(string username, string password)
{
var membershipProvider = Membership.Providers[UmbracoConfiguration.Current.UmbracoSettings.Providers.DefaultBackOfficeUserProvider];
var membershipProvider = Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider];
return membershipProvider != null && membershipProvider.ValidateUser(username, password);
}
@@ -189,7 +189,7 @@ namespace Umbraco.Web.Security
/// <returns></returns>
internal bool ChangePassword(string oldpassword, string newpassword)
{
var membershipProvider = Membership.Providers[UmbracoConfiguration.Current.UmbracoSettings.Providers.DefaultBackOfficeUserProvider];
var membershipProvider = Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider];
return membershipProvider.GetUser(CurrentUser.Username, true).ChangePassword(oldpassword, newpassword);
}