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

Adds safety check of Udi.TryParse

Browse Source
This commit is contained in:
Shannon
2019-10-31 14:08:38 +11:00
parent f305dd45cb
commit 3d66c201c2
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/PropertyEditors/ContentPickerPropertyEditor.cs
View File

@@ -41,7 +41,8 @@ namespace Umbraco.Web.PropertyEditors
if (string.IsNullOrEmpty(asString)) yield break;
yield return new UmbracoEntityReference(Udi.Parse(asString));
if (Udi.TryParse(asString, out var udi))
yield return new UmbracoEntityReference(udi);
}
}
}

3
src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
View File

@@ -45,7 +45,8 @@ namespace Umbraco.Web.PropertyEditors
if (string.IsNullOrEmpty(asString)) yield break;
yield return new UmbracoEntityReference(Udi.Parse(asString));
if (Udi.TryParse(asString, out var udi))
yield return new UmbracoEntityReference(udi);
}
}
}

3
src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs
View File

@@ -37,7 +37,8 @@ namespace Umbraco.Web.PropertyEditors
var udiPaths = asString.Split(',');
foreach (var udiPath in udiPaths)
{
yield return new UmbracoEntityReference(Udi.Parse(udiPath));
if (Udi.TryParse(udiPath, out var udi))
yield return new UmbracoEntityReference(udi);
}
}

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

@@ -181,7 +181,7 @@ namespace Umbraco.Web.PropertyEditors
if (string.IsNullOrEmpty(asString)) yield break;
var links = JsonConvert.DeserializeObject<List<MultiUrlPickerValueEditor.LinkDto>>(asString);
var links = JsonConvert.DeserializeObject<List<LinkDto>>(asString);
foreach (var link in links)
{
if (link.Udi != null) // Links can be absolute links without a Udi