From a551881ce2546fcf71e98700d450365b90fad14e Mon Sep 17 00:00:00 2001
From: Sebastiaan Jansssen <sebastiaan@umbraco.com>
Date: Mon, 19 Feb 2018 17:13:03 +0100
Subject: [PATCH] TypedMember(object id) didn't know how to deal with UDI
 values coming in, breaking MNTP pickers

---
 src/Umbraco.Web/UmbracoHelper.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index d94476b31c..6c7cc6f2c7 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -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)