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

Merge branch 'v8/dev' into v8/bugfix/7868-nucache-null-parent

Browse Source 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
This commit is contained in:
Shannon
2020-04-17 15:04:10 +10:00
parent 6cd7e5d055 d5e2c12685
commit d1524cdafe
12 changed files with 132 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
View File

@@ -192,6 +192,10 @@ namespace Umbraco.Web.PropertyEditors
public IEnumerable<UmbracoEntityReference> GetReferences(object value)
{
var rawJson = value == null ? string.Empty : value is string str ? str : value.ToString();
if (rawJson.IsNullOrWhiteSpace())
yield break;
DeserializeGridValue(rawJson, out var richTextEditorValues, out var mediaValues);
foreach (var umbracoEntityReference in richTextEditorValues.SelectMany(x =>

7
src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
View File

@@ -45,8 +45,11 @@ namespace Umbraco.Web.PropertyEditors
if (string.IsNullOrEmpty(asString)) yield break;
if (Udi.TryParse(asString, out var udi))
yield return new UmbracoEntityReference(udi);
foreach (var udiStr in asString.Split(','))
{
if (Udi.TryParse(udiStr, out var udi))
yield return new UmbracoEntityReference(udi);
}
}
}
}

5
src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
View File

@@ -896,8 +896,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
// get the required link node, this ensures that both `link` and `link.Value` are not null
var link = GetRequiredLinkedNode(id, "child", null);
ClearBranchLocked(link.Value); // recurse
id = link.Value.NextSiblingContentId;
var linkValue = link.Value; // capture local since clearing in recurse can clear it
ClearBranchLocked(linkValue); // recurse
id = linkValue.NextSiblingContentId;
}
}