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

fix string.Empty back to null

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-24 12:59:40 +01:00
parent b5e4f3b982
commit 86ae730b1e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Infrastructure/Packaging/PackageDataInstallation.cs
View File

@@ -218,7 +218,7 @@ namespace Umbraco.Cms.Infrastructure.Packaging
IDictionary<string, TContentTypeComposition> importedContentTypes,
IContentTypeBaseService<TContentTypeComposition> typeService,
IContentServiceBase<TContentBase> service)
where TContentBase : class?, IContentBase
where TContentBase : class, IContentBase
where TContentTypeComposition : IContentTypeComposition
{
var contents = new List<TContentBase>();
@@ -378,7 +378,7 @@ namespace Umbraco.Cms.Infrastructure.Packaging
? contentType.CompositionPropertyTypes.ToDictionary(x => x.Alias, x => x)
: contentType.PropertyTypes.ToDictionary(x => x.Alias, x => x);
var foundLanguages = new HashSet<string>();
var foundLanguages = new HashSet<string?>();
foreach (var property in properties)
{
string propertyTypeAlias = property.Name.LocalName;
@@ -387,14 +387,14 @@ namespace Umbraco.Cms.Infrastructure.Packaging
var propertyValue = property.Value;
// Handle properties language attributes
var propertyLang = property.Attribute(XName.Get("lang"))?.Value ?? string.Empty;
var propertyLang = property.Attribute(XName.Get("lang"))?.Value ?? null;
foundLanguages.Add(propertyLang);
if (propTypes.TryGetValue(propertyTypeAlias, out var propertyType))
{
// set property value
// Skip unsupported language variation, otherwise we'll get a "not supported error"
// We allow null, because that's invariant
if (installedLanguages.InvariantContains(propertyLang) || propertyLang is null)
if ( propertyLang is null || installedLanguages.InvariantContains(propertyLang))
{
content.SetValue(propertyTypeAlias, propertyValue, propertyLang);
}
@@ -404,7 +404,7 @@ namespace Umbraco.Cms.Infrastructure.Packaging
foreach (var propertyLang in foundLanguages)
{
if (string.IsNullOrEmpty(content.GetCultureName(propertyLang)) &&
if (string.IsNullOrEmpty(content.GetCultureName(propertyLang)) && propertyLang is not null &&
installedLanguages.InvariantContains(propertyLang))
{
content.SetCultureName(nodeName, propertyLang);