diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index b2045bacfb..12d4ce1d76 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,28 @@ namespace Umbraco.Web return ContentForObjects(ids); } + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable Content(params Udi[] ids) + { + return ids.Select(id => ContentQuery.Content(id)).WhereNotNull(); + } + + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable Content(params GuidUdi[] ids) + { + return ids.Select(id => ContentQuery.Content(id)); + } + private IEnumerable ContentForObjects(IEnumerable ids) { var idsA = ids.ToArray(); @@ -418,6 +438,27 @@ namespace Umbraco.Web { return ContentForObjects(ids); } + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable Content(IEnumerable ids) + { + return ids.Select(id => ContentQuery.Content(id)).WhereNotNull(); + } + + /// + /// Gets the contents corresponding to the identifiers. + /// + /// The content identifiers. + /// The existing contents corresponding to the identifiers. + /// If an identifier does not match an existing content, it will be missing in the returned value. + public IEnumerable Content(IEnumerable ids) + { + return ids.Select(id => ContentQuery.Content(id)); + } /// /// Gets the contents corresponding to the identifiers. @@ -634,6 +675,29 @@ namespace Umbraco.Web return MediaForObjects(ids); } + + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable Media(params Udi[] ids) + { + return ids.Select(id => ContentQuery.Media(id)).WhereNotNull(); + } + + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable Media(params GuidUdi[] ids) + { + return ids.Select(id => ContentQuery.Media(id)); + } + /// /// Gets the medias corresponding to the identifiers. /// @@ -656,6 +720,28 @@ namespace Umbraco.Web return ContentQuery.Media(ids); } + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable Media(IEnumerable ids) + { + return ids.Select(id => ContentQuery.Media(id)).WhereNotNull(); + } + + /// + /// Gets the medias corresponding to the identifiers. + /// + /// The media identifiers. + /// The existing medias corresponding to the identifiers. + /// If an identifier does not match an existing media, it will be missing in the returned value. + public IEnumerable Media(IEnumerable ids) + { + return ids.Select(id => ContentQuery.Media(id)); + } + /// /// Gets the medias corresponding to the identifiers. ///