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

simplified GuidUdi checking.

Browse Source
This commit is contained in:
Mario Lopez
2019-02-28 16:50:28 +11:00
parent f227f2ed61
commit 093b57505a
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>