Initialize content picker field with empty array (#3247)

OrchardCMS · Feb 27, 2019 · 448befd · 448befd
1 parent 251a036
commit 448befd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Drivers/ContentPickerFieldDisplayDriver.cs
@@ -50,15 +50,15 @@ public override IDisplayResult Edit(ContentPickerField field, BuildFieldEditorCo
         {
             return Initialize<EditContentPickerFieldViewModel>(GetEditorShapeType(context), async model =>
             {
-                model.ContentItemIds = field.ContentItemIds == null ? string.Empty : string.Join(",", field.ContentItemIds);
+                model.ContentItemIds = string.Join(",", field.ContentItemIds);
 
                 model.Field = field;
                 model.Part = context.ContentPart;
                 model.PartFieldDefinition = context.PartFieldDefinition;
 
                 model.SelectedItems = new List<ContentPickerItemViewModel>();
 
-                foreach (var contentItemId in field.ContentItemIds ?? new string[0])
+                foreach (var contentItemId in field.ContentItemIds)
                 {
                     var contentItem = await _contentManager.GetAsync(contentItemId, VersionOptions.Latest);
 

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Fields/ContentPickerField.cs
@@ -1,9 +1,10 @@
+using System;
 using OrchardCore.ContentManagement;
 
 namespace OrchardCore.ContentFields.Fields
 {
     public class ContentPickerField : ContentField
     {
-        public string[] ContentItemIds { get; set; }
+        public string[] ContentItemIds { get; set; } = Array.Empty<string>();
     }
 }