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

Fix getting content AtRoot

Browse Source
This commit is contained in:
Stephan
2019-06-27 13:29:35 +02:00
parent cb7300688c
commit 7a178be031
2 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
View File

@@ -261,10 +261,22 @@ namespace Umbraco.Web.PublishedCache.NuCache
if (culture == null)
culture = _variationContextAccessor?.VariationContext?.Culture ?? "";
// _snapshot.GetAtRoot() returns all ContentNode at root
// both .Draft and .Published cannot be null at the same time
// root is already sorted by sortOrder, and does not contain nulls
var atRoot = _snapshot.GetAtRoot().Select(n => GetNodePublishedContent(n, preview));
return culture == "*" ? atRoot : atRoot.Where(x => x.IsInvariantOrHasCulture(culture));
//
// GetNodePublishedContent may return null if !preview and there is no
// published model, so we need to filter these nulls out
var atRoot = _snapshot.GetAtRoot()
.Select(n => GetNodePublishedContent(n, preview))
.WhereNotNull();
// if a culture is specified, we must ensure that it is avail/published
if (culture != "*")
atRoot = atRoot.Where(x => x.IsInvariantOrHasCulture(culture));
return atRoot;
}
private static IPublishedContent GetNodePublishedContent(ContentNode node, bool preview)