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

Merge pull request #6751 from Jeavon/v8/bugfix/null-user-rte-editor

Browse Source 
Add additional null conditionals to the FromEditor method of RichTextPropertyValueEditor
This commit is contained in:
Claus
2019-10-22 14:19:21 +02:00
committed by GitHub
parent d2cde44b1f a854dcb737
commit 3573df3531
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ namespace Umbraco.Web.PropertyEditors
var grid = DeserializeGridValue(rawJson, out var rtes);
var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? Constants.Security.SuperUserId;
var userId = _umbracoContextAccessor.UmbracoContext?.Security?.CurrentUser?.Id ?? Constants.Security.SuperUserId;
// Process the rte values
foreach (var rte in rtes)

2
src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
View File

@@ -114,7 +114,7 @@ namespace Umbraco.Web.PropertyEditors
if (editorValue.Value == null)
return null;
var userId = _umbracoContextAccessor.UmbracoContext?.Security.CurrentUser.Id ?? Constants.Security.SuperUserId;
var userId = _umbracoContextAccessor.UmbracoContext?.Security?.CurrentUser?.Id ?? Constants.Security.SuperUserId;
var config = editorValue.DataTypeConfiguration as RichTextConfiguration;
var mediaParent = config?.MediaParentId;