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

Fix IPublishedContent.Children() and NuCache

Browse Source
This commit is contained in:
Stephan
2019-04-22 19:49:49 +02:00
parent 55d4457c70
commit 4feb766cc6
19 changed files with 64 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,28 +246,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
public override IEnumerable<IPublishedContent> GetAtRoot(bool preview)
{
if (PublishedSnapshotService.CacheContentCacheRoots == false)
return GetAtRootNoCache(preview);
var cache = preview == false || PublishedSnapshotService.FullCacheWhenPreviewing
? _elementsCache
: _snapshotCache;
if (cache == null)
return GetAtRootNoCache(preview);
// note: ToArray is important here, we want to cache the result, not the function!
return (IEnumerable<IPublishedContent>)cache.Get(
CacheKeys.ContentCacheRoots(preview),
() => GetAtRootNoCache(preview).ToArray());
}
private IEnumerable<IPublishedContent> GetAtRootNoCache(bool preview)
{
var c = _snapshot.GetAtRoot();
// both .Draft and .Published cannot be null at the same time
return c.Select(n => GetNodePublishedContent(n, preview)).WhereNotNull().OrderBy(x => x.SortOrder);
// root is already sorted by sortOrder, and does not contain nulls
return _snapshot.GetAtRoot().Select(n => GetNodePublishedContent(n, preview));
}
private static IPublishedContent GetNodePublishedContent(ContentNode node, bool preview)