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

Makes checks a little more robust

Browse Source
This commit is contained in:
Sebastiaan Janssen
2019-07-24 11:32:18 +02:00
parent ece31733a9
commit ca75a25802
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
View File

@@ -39,14 +39,23 @@ namespace Umbraco.Web.PropertyEditors
/// <inheritdoc />
public override object FromEditor(ContentPropertyData editorValue, object currentValue)
{
var value = editorValue?.Value?.ToString();
if (string.IsNullOrEmpty(value))
{
return null;
}
if (editorValue.Value is JArray json)
{
return json.Select(x => x.Value<string>());
}
else if ( editorValue.Value is string stringValue && !String.IsNullOrWhiteSpace(stringValue))
if (string.IsNullOrWhiteSpace(value) == false)
{
return stringValue.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
return value.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
}
return null;
}