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

Merge branch temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-10-26 15:10:20 +02:00
parent 5c077c3e5d 628895cc89
commit a4c81b269f
92 changed files with 1504 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1160,6 +1160,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
var pdatas = new List<PropertyData>();
foreach (var pvalue in prop.Values)
{
// sanitize - properties should be ok but ... never knows
if (!prop.PropertyType.SupportsVariation(pvalue.Culture, pvalue.Segment))
continue;
// note: at service level, invariant is 'null', but here invariant becomes 'string.Empty'
var value = published ? pvalue.PublishedValue : pvalue.EditedValue;
if (value != null)
@@ -1191,15 +1195,19 @@ namespace Umbraco.Web.PublishedCache.NuCache
var cultureData = new Dictionary<string, CultureVariation>();
var names = content is IContent document
// sanitize - names should be ok but ... never knows
if (content.GetContentType().VariesByCulture())
{
var infos = content is IContent document
? (published
? document.PublishCultureInfos
: document.CultureInfos)
: content.CultureInfos;
foreach (var (culture, name) in names)
{
cultureData[culture] = new CultureVariation { Name = name.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue };
foreach (var (culture, info) in infos)
{
cultureData[culture] = new CultureVariation { Name = info.Name, Date = content.GetUpdateDate(culture) ?? DateTime.MinValue };
}
}
//the dictionary that will be serialized