Merge branch 'v8/8.12' into v8/dev

2021-03-31 13:00:32 +02:00
parent c881fa9e7d acaf1941fe
commit 2f60a471b3
6 changed files with 43 additions and 54 deletions
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -202,8 +202,8 @@ namespace Umbraco.Web.PropertyEditors
                    _richTextPropertyValueEditor.GetReferences(x.Value)))
                    yield return umbracoEntityReference;

-                foreach (var umbracoEntityReference in mediaValues.SelectMany(x =>
-                    _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
+                foreach (var umbracoEntityReference in mediaValues.Where(x => x.Value.HasValues)
+                    .SelectMany(x => _mediaPickerPropertyValueEditor.GetReferences(x.Value["udi"])))
                    yield return umbracoEntityReference;
            }
        }