Merge pull request #2396 from leekelleher/issue/U4-10842

U4-10842 LegacyMediaPickerPropertyConverter null-reference check
2018-01-18 17:17:45 +01:00
parent de6f9236e7 e466878925
commit 57745fe71d
1 changed files with 3 additions and 0 deletions
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs
@@ -85,6 +85,9 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
        /// </returns>
        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
        {
+            if (source == null)
+                return null;
+
            if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
            {
                var nodeIds =