From 093b57505a3e27e3709d412e90dbd738091632e2 Mon Sep 17 00:00:00 2001
From: Mario Lopez <mario@koben.com.au>
Date: Thu, 28 Feb 2019 16:50:28 +1100
Subject: [PATCH] simplified GuidUdi checking.

---
 src/Umbraco.Web/UmbracoHelper.cs | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 12a985c02d..12d4ce1d76 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -373,9 +373,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(params Udi[] ids)
         {
-            if (!(ids is IEnumerable<GuidUdi> udis)) return null;
-
-            return ids.Select(id => ContentQuery.Content(id));
+            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -447,10 +445,8 @@ namespace Umbraco.Web
         /// <returns>The existing contents corresponding to the identifiers.</returns>
         /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Content(IEnumerable<Udi> ids)
-        {
-            if (!(ids is IEnumerable<GuidUdi> udis)) return null;
-
-            return ids.Select(id => ContentQuery.Content(id));
+        {          
+            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -688,9 +684,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(params Udi[] ids)
         {
-            if (!(ids is IEnumerable<GuidUdi> udis)) return null;
-
-            return ids.Select(id => ContentQuery.Media(id));
+            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
         }
 
         /// <summary>
@@ -734,9 +728,7 @@ namespace Umbraco.Web
         /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
         public IEnumerable<IPublishedContent> Media(IEnumerable<Udi> ids)
         {
-            if (!(ids is IEnumerable<GuidUdi> udis)) return null;
-
-            return ids.Select(id => ContentQuery.Media(id));
+            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
         }
 
         /// <summary>