diff --git a/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs b/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs index 5ee609b148..d8186f0dfa 100644 --- a/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs +++ b/src/Umbraco.Core/Models/Blocks/BlockEditorData.cs @@ -16,6 +16,7 @@ namespace Umbraco.Core.Models.Blocks private BlockEditorData() { + BlockValue = new BlockValue(); } public BlockEditorData(string propertyEditorAlias, diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs index 4d972f7a33..b04ef2d444 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/BlockListPropertyValueConverter.cs @@ -18,11 +18,13 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters { private readonly IProfilingLogger _proflog; private readonly BlockEditorConverter _blockConverter; + private readonly BlockListEditorDataConverter _blockListEditorDataConverter; public BlockListPropertyValueConverter(IProfilingLogger proflog, BlockEditorConverter blockConverter) { _proflog = proflog; _blockConverter = blockConverter; + _blockListEditorDataConverter = new BlockListEditorDataConverter(); } /// @@ -61,8 +63,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters var value = (string)inter; if (string.IsNullOrWhiteSpace(value)) return BlockListModel.Empty; - var converter = new BlockListEditorDataConverter(); - var converted = converter.Deserialize(value); + var converted = _blockListEditorDataConverter.Deserialize(value); if (converted.BlockValue.ContentData.Count == 0) return BlockListModel.Empty; var blockListLayout = converted.Layout.ToObject>();