yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if value is null or whitespace before reading grid configuration

Browse Source
This commit is contained in:
Bjarne Fyrstenborg
2019-10-08 18:55:44 +02:00
parent e7196d5edf
commit 646bfb02f2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
View File

@@ -78,20 +78,20 @@ namespace Umbraco.Web.PropertyEditors
if (editorValue.Value == null)
return null;
var config = editorValue.DataTypeConfiguration as GridConfiguration;
var mediaParent = config?.MediaParentId;
var mediaParentId = mediaParent == null ? Guid.Empty : mediaParent.Guid;
// editorValue.Value is a JSON string of the grid
var rawJson = editorValue.Value.ToString();
if (rawJson.IsNullOrWhiteSpace())
return null;
var config = editorValue.DataTypeConfiguration as GridConfiguration;
var mediaParent = config?.MediaParentId;
var mediaParentId = mediaParent == null ? Guid.Empty : mediaParent.Guid;
var grid = DeserializeGridValue(rawJson, out var rtes);
var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? Constants.Security.SuperUserId;
//process the rte values
// Process the rte values
foreach (var rte in rtes)
{
// Parse the HTML