Skip to content

Commit 0857fad

Browse files
author
Hayder Sharhan
committed
Merge commit 'refs/pull/4269/head' of https://github.com/magento/magento2 into MAGETWO-53265
2 parents 532dcd5 + da7f499 commit 0857fad

File tree

1 file changed

+5
-3
lines changed
  • app/code/Magento/ConfigurableProduct/Model/Product/Validator

1 file changed

+5
-3
lines changed

app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,11 @@ protected function _validateProductVariations(Product $parentProduct, array $pro
112112
$product->addData($productData);
113113
$product->setCollectExceptionMessages(true);
114114
$configurableAttribute = [];
115-
$encodedData = $productData['configurable_attribute'];
116-
if ($encodedData) {
117-
$configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
115+
if (!empty($productData['configurable_attribute'])) {
116+
$encodedData = $productData['configurable_attribute'];
117+
if ($encodedData) {
118+
$configurableAttribute = $this->jsonHelper->jsonDecode($encodedData);
119+
}
118120
}
119121
$configurableAttribute = implode('-', $configurableAttribute);
120122

0 commit comments

Comments
 (0)