From 746d3d54c25932de039e27feb8f56bc689a33430 Mon Sep 17 00:00:00 2001
From: Thierry Fleury <thierry@codinlab.fr>
Date: Tue, 18 Aug 2015 12:46:09 +0200
Subject: [PATCH 1/2] Fixes 5614 : ContentPickerField and LayoutPart throws
 argument null exception.

---
 .../Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
index b08c95247..9d037c02e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
@@ -17,7 +17,7 @@ namespace Orchard.ContentPicker.Fields {
 
         public IEnumerable<ContentItem> ContentItems { 
             get {
-                return _contentItems.Value;
+                return _contentItems.Value ?? new ContentItem[0];
             }
         }
 

From 9980633ac3228c97939cb99100499567b6d2b544 Mon Sep 17 00:00:00 2001
From: Thierry Fleury <thierry@codinlab.fr>
Date: Thu, 20 Aug 2015 23:57:38 +0200
Subject: [PATCH 2/2] Use Enumerable.Empty

---
 .../Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
index 9d037c02e..8b7c15194 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs
@@ -17,7 +17,7 @@ namespace Orchard.ContentPicker.Fields {
 
         public IEnumerable<ContentItem> ContentItems { 
             get {
-                return _contentItems.Value ?? new ContentItem[0];
+                return _contentItems.Value ?? Enumerable.Empty<ContentItem>();
             }
         }