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

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8

Browse Source
This commit is contained in:
Sebastiaan Jansssen
2018-02-19 17:20:12 +01:00
parent 567c0977d0 a551881ce2
commit 7abc6d3d4f
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/UmbracoHelper.cs
View File

@@ -537,8 +537,16 @@ namespace Umbraco.Web
public IPublishedContent TypedMember(object id)
{
var asInt = id.TryConvertTo<int>();
return asInt ? MembershipHelper.GetById(asInt.Result) : MembershipHelper.GetByProviderKey(id);
int intId;
if (ConvertIdObjectToInt(id, out intId))
return MembershipHelper.GetById(intId);
Guid guidId;
if (ConvertIdObjectToGuid(id, out guidId))
return TypedMember(guidId);
Udi udiId;
if (ConvertIdObjectToUdi(id, out udiId))
return TypedMember(udiId);
return null;
}
public IPublishedContent TypedMember(int id)