#17890: show correct text swatch values per store view

magicaner · nmalevanec · commit f359bbcd3d73 · 2018-11-01T11:44:56.000+02:00
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
@@ -488,6 +488,8 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)
                 && $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']
             ) {
                 $swatches[$optionId] = $optionsArray[$currentStoreId];
+            } elseif (isset($optionsArray[$currentStoreId])) {
+                $swatches[$optionId] = $optionsArray[$currentStoreId];
             } elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {
                 $swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];
             }

Original file line number	Diff line number	Diff line change
`@@ -488,6 +488,8 @@ private function addFallbackOptions(array $fallbackValues, array $swatches)`
`488`	`488`	`&& $swatches[$optionId]['type'] === $optionsArray[$currentStoreId]['type']`
`489`	`489`	`) {`
`490`	`490`	`$swatches[$optionId] = $optionsArray[$currentStoreId];`
	`491`	`+ } elseif (isset($optionsArray[$currentStoreId])) {`
	`492`	`+ $swatches[$optionId] = $optionsArray[$currentStoreId];`
`491`	`493`	`} elseif (isset($optionsArray[self::DEFAULT_STORE_ID])) {`
`492`	`494`	`$swatches[$optionId] = $optionsArray[self::DEFAULT_STORE_ID];`
`493`	`495`	`}`