Skip to content

Commit c20b30d

Browse files
authored
Fix null reference exception when removing all blocks from shared RTE in culture variant content (#19771)
Fix null reference exception when removing all blocks from culture variant content
1 parent be8e0f3 commit c20b30d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ private void MapBlockItemDataToEditor(IProperty property, List<BlockItemData> it
362362
var mergedInvariant = UpdateSourceInvariantData(source, target, canUpdateInvariantData);
363363

364364
// if the structure (invariant) is not defined after merger, the target content does not matter
365-
if (mergedInvariant is null)
365+
if (mergedInvariant?.Layout is null)
366366
{
367367
return null;
368368
}
@@ -393,14 +393,14 @@ private void MapBlockItemDataToEditor(IProperty property, List<BlockItemData> it
393393
RestoreMissingValues(
394394
source.BlockValue.ContentData,
395395
target.BlockValue.ContentData,
396-
mergedInvariant.Layout!,
396+
mergedInvariant.Layout,
397397
(layoutItem, itemData) => layoutItem.ContentKey == itemData.Key,
398398
canUpdateInvariantData,
399399
allowedCultures);
400400
RestoreMissingValues(
401401
source.BlockValue.SettingsData,
402402
target.BlockValue.SettingsData,
403-
mergedInvariant.Layout!,
403+
mergedInvariant.Layout,
404404
(layoutItem, itemData) => layoutItem.SettingsKey == itemData.Key,
405405
canUpdateInvariantData,
406406
allowedCultures);

0 commit comments

Comments
 (0)