Match source block both on culture and alias (#18582)

kjac · web-flow · commit 11d9b3a1bd8b · 2025-03-05T14:23:33.000+01:00
diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
@@ -358,8 +358,8 @@ private void CleanupVariantValues(
 
             foreach (BlockPropertyValue targetBlockPropertyValue in targetBlockItem.Values)
             {
-                BlockPropertyValue? sourceBlockPropertyValue =
-                    sourceBlockItem?.Values.FirstOrDefault(v => v.Culture == targetBlockPropertyValue.Culture);
+                BlockPropertyValue? sourceBlockPropertyValue = sourceBlockItem?.Values.FirstOrDefault(v
+                    => v.Alias == targetBlockPropertyValue.Alias && v.Culture == targetBlockPropertyValue.Culture);
 
                 // todo double check if this path can have an invariant value, but it shouldn't right???
                 // => it can be a null culture, but we shouldn't do anything? as the invariant section should have done it already

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,8 @@ private void CleanupVariantValues(`
`358`	`358`
`359`	`359`	`foreach (BlockPropertyValue targetBlockPropertyValue in targetBlockItem.Values)`
`360`	`360`	`{`
`361`		`- BlockPropertyValue? sourceBlockPropertyValue =`
`362`		`- sourceBlockItem?.Values.FirstOrDefault(v => v.Culture == targetBlockPropertyValue.Culture);`
	`361`	`+ BlockPropertyValue? sourceBlockPropertyValue = sourceBlockItem?.Values.FirstOrDefault(v`
	`362`	`+ => v.Alias == targetBlockPropertyValue.Alias && v.Culture == targetBlockPropertyValue.Culture);`
`363`	`363`
`364`	`364`	`// todo double check if this path can have an invariant value, but it shouldn't right???`
`365`	`365`	`// => it can be a null culture, but we shouldn't do anything? as the invariant section should have done it already`