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

oops fixed build

Browse Source
This commit is contained in:
Shannon
2014-05-08 19:03:40 +10:00
parent 94732cff00
commit ed292d34db
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/Security/MembershipHelper.cs
View File

@@ -86,8 +86,8 @@ namespace Umbraco.Web.Security
//This will occur if an email already exists!
return Attempt<MembershipUser>.Fail(ex);
}
var member = GetCurrentMember();
var member = GetCurrentPersistedMember();
//NOTE: If changing the username is a requirement, than that needs to be done via the IMember directly since MembershipProvider's natively do
// not support changing a username!
@@ -274,7 +274,7 @@ namespace Umbraco.Web.Security
{
return null;
}
var result = GetCurrentMember();
var result = GetCurrentPersistedMember();
var provider = MPE.GetMembersMembershipProvider();
return result == null ? null : new MemberPublishedContent(result, provider.GetUser(result.Username, true));
}
@@ -313,7 +313,7 @@ namespace Umbraco.Web.Security
if (provider.IsUmbracoMembershipProvider())
{
var membershipUser = provider.GetCurrentUser();
var member = GetCurrentMember();
var member = GetCurrentPersistedMember();
//this shouldn't happen but will if the member is deleted in the back office while the member is trying
// to use the front-end!
if (member == null)
@@ -460,7 +460,7 @@ namespace Umbraco.Web.Security
if (provider.IsUmbracoMembershipProvider())
{
var member = GetCurrentMember();
var member = GetCurrentPersistedMember();
//this shouldn't happen but will if the member is deleted in the back office while the member is trying
// to use the front-end!
if (member == null)
@@ -543,7 +543,7 @@ namespace Umbraco.Web.Security
string username;
if (provider.IsUmbracoMembershipProvider())
{
var member = GetCurrentMember();
var member = GetCurrentPersistedMember();
username = member.Username;
// If types defined, check member is of one of those types
var allowTypesList = allowTypes as IList<string> ?? allowTypes.ToList();
@@ -793,7 +793,7 @@ namespace Umbraco.Web.Security
/// Returns the currently logged in IMember object - this should never be exposed to the front-end since it's returning a business logic entity!
/// </summary>
/// <returns></returns>
private IMember GetCurrentMember()
private IMember GetCurrentPersistedMember()
{
var provider = MPE.GetMembersMembershipProvider();