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

Fix null reference exception when removing all blocks from shared RTE in culture variant content (#19771)

Browse Source 
Fix null reference exception when removing all blocks from culture variant content
This commit is contained in:
Laura Neto
2025-07-23 20:10:02 +02:00
committed by GitHub
parent be8e0f319d
commit c20b30d625
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
View File

@@ -362,7 +362,7 @@ public abstract class BlockValuePropertyValueEditorBase<TValue, TLayout> : DataV
var mergedInvariant = UpdateSourceInvariantData(source, target, canUpdateInvariantData);
// if the structure (invariant) is not defined after merger, the target content does not matter
if (mergedInvariant is null)
if (mergedInvariant?.Layout is null)
{
return null;
}
@@ -393,14 +393,14 @@ public abstract class BlockValuePropertyValueEditorBase<TValue, TLayout> : DataV
RestoreMissingValues(
source.BlockValue.ContentData,
target.BlockValue.ContentData,
mergedInvariant.Layout!,
mergedInvariant.Layout,
(layoutItem, itemData) => layoutItem.ContentKey == itemData.Key,
canUpdateInvariantData,
allowedCultures);
RestoreMissingValues(
source.BlockValue.SettingsData,
target.BlockValue.SettingsData,
mergedInvariant.Layout!,
mergedInvariant.Layout,
(layoutItem, itemData) => layoutItem.SettingsKey == itemData.Key,
canUpdateInvariantData,
allowedCultures);