From f227f2ed616dafd2378c7b6fbd2903ef8d78ebd2 Mon Sep 17 00:00:00 2001
From: Mario Lopez <mario@koben.com.au>
Date: Thu, 28 Feb 2019 13:55:14 +1100
Subject: [PATCH 1/2] added Content and Media Udi overloads

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

diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index b2045bacfb..12a985c02d 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -5,11 +5,9 @@ using System.Web;
 using System.Xml.XPath;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
-using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web
@@ -367,6 +365,30 @@ namespace Umbraco.Web
             return ContentForObjects(ids);
         }
 
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <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(params Udi[] ids)
+        {
+            if (!(ids is IEnumerable<GuidUdi> udis)) return null;
+
+            return ids.Select(id => ContentQuery.Content(id));
+        }
+
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <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(params GuidUdi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Content(id));
+        }
+
         private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
@@ -418,6 +440,29 @@ namespace Umbraco.Web
         {
             return ContentForObjects(ids);
         }
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <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));
+        }
+
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <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<GuidUdi> ids)
+        {
+            return ids.Select(id => ContentQuery.Content(id));
+        }
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -634,6 +679,31 @@ namespace Umbraco.Web
             return MediaForObjects(ids);
         }
 
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <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));
+        }
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(params GuidUdi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id));
+        }
+
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
         /// </summary>
@@ -656,6 +726,30 @@ namespace Umbraco.Web
             return ContentQuery.Media(ids);
         }
 
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <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));
+        }
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(IEnumerable<GuidUdi> ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id));
+        }
+
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
         /// </summary>

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 2/2] 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>