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

Fixes merge issues

Browse Source
This commit is contained in:
Shannon
2014-02-21 16:43:49 +11:00
parent 3c3f2d7c8d
commit 9de0a62cff
8 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
View File

@@ -264,7 +264,7 @@ namespace Umbraco.Web.Models.Mapping
}
else
{
var umbracoProvider = (IUmbracoContentTypeMembershipProvider)Membership.Provider;
var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)Membership.Provider;
//This is kind of a hack because a developer is supposed to be allowed to set their property editor - would have been much easier
// if we just had all of the membeship provider fields on the member table :(
@@ -323,7 +323,7 @@ namespace Umbraco.Web.Models.Mapping
}
else
{
var umbracoProvider = (IUmbracoContentTypeMembershipProvider)Membership.Provider;
var umbracoProvider = (IUmbracoMemberTypeMembershipProvider)Membership.Provider;
return new Dictionary<string, string>
{