lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#5489: Handling potential null value for MediaLibraryPickerField.MediaParts.

Browse Source 
This happens when a content type has both a MediaLibraryPickerField and the LayoutPart attached.
The layout editor renders the field, whose shape template accesses the MediaParts property, which is not initialized for new content items.

Fixes #5489
This commit is contained in:
Sipke Schoorstra
2015-07-08 22:45:52 +01:00
parent 89c5b2f7de
commit 9a2eaf7ac9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.MediaLibrary/Fields/MediaLibraryPickerField.cs
View File

@@ -7,7 +7,7 @@ using Orchard.MediaLibrary.Models;
namespace Orchard.MediaLibrary.Fields { namespace Orchard.MediaLibrary.Fields {
public class MediaLibraryPickerField : ContentField { public class MediaLibraryPickerField : ContentField {
private static readonly char[] separator = new [] {'{', '}', ','}; private static readonly char[] separator = {'{', '}', ','};
internal Lazy<IEnumerable<MediaPart>> _contentItems; internal Lazy<IEnumerable<MediaPart>> _contentItems;
public int[] Ids { public int[] Ids {
@@ -17,7 +17,7 @@ namespace Orchard.MediaLibrary.Fields {
public IEnumerable<MediaPart> MediaParts { public IEnumerable<MediaPart> MediaParts {
get { get {
return _contentItems.Value; return _contentItems != null ? _contentItems.Value : Enumerable.Empty<MediaPart>();
} }
} }