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

Merge branch 'temp8' into temp8-contentAndType

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/Content.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Tests/Models/ContentTests.cs
This commit is contained in:
Shannon
2019-02-07 11:41:06 +11:00
parent b260c18056 0606d1bc8b
commit c04da30547
58 changed files with 1753 additions and 999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
View File

@@ -1239,10 +1239,11 @@ namespace Umbraco.Web.PublishedCache.NuCache
: document.CultureInfos)
: content.CultureInfos;
foreach (var (culture, info) in infos)
// ReSharper disable once UseDeconstruction
foreach (var cultureInfo in infos)
{
var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(culture);
cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
var cultureIsDraft = !published && content is IContent d && d.IsCultureEdited(cultureInfo.Culture);
cultureData[cultureInfo.Culture] = new CultureVariation { Name = cultureInfo.Name, Date = content.GetUpdateDate(cultureInfo.Culture) ?? DateTime.MinValue, IsDraft = cultureIsDraft };
}
}