ENGCOM-3360: [Forwardport] #17890: show correct text swatch values pe…

…r store view #18988 - Merge Pull Request #18988 from nmalevanec/magento2:2.3-develop-PR-port-17891 - Merged commits: 1. f359bbc
magento · Nov 1, 2018 · b3958d3 · b3958d3
2 parents da1a96c + f359bbc
commit b3958d3
Showing 1 changed file with 2 additions and 0 deletions.
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];
             }