Merge branch temp8 into temp8-3129

This commit is contained in:
Stephan
2018-10-25 10:32:05 +02:00
80 changed files with 1199 additions and 533 deletions

View File

@@ -1198,15 +1198,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
// sanitize - names should be ok but ... never knows
if (content.GetContentType().VariesByCulture())
{
var names = content is IContent document
var infos = content is IContent document
? (published
? document.PublishNames
: document.CultureNames)
: content.CultureNames;
? document.PublishCultureInfos
: document.CultureInfos)
: content.CultureInfos;
foreach (var (culture, name) in names)
foreach (var (culture, info) in infos)
{
cultureData[culture] = new CultureVariation { Name = name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue };
cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue };
}
}