Merge pull request #1341 from magento-engcom/2.1-develop-prs

Oleksii Korshenko · web-flow · commit f59024fa402f · 2017-07-18T17:02:31.000-05:00
Public Pull Requests #10282
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -430,7 +430,7 @@ protected function isOptionsValid(array $options, Attribute $attribute)
             if ($this->isOptionForDelete($attribute, $optionId)) {
                 continue;
             }
-            if (empty($option[0])) {
+            if (!isset($option[0]) || $option[0] === '') {
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ protected function isOptionsValid(array $options, Attribute $attribute)`
`430`	`430`	`if ($this->isOptionForDelete($attribute, $optionId)) {`
`431`	`431`	`continue;`
`432`	`432`	`}`
`433`		`- if (empty($option[0])) {`
	`433`	`+ if (!isset($option[0]) \|\| $option[0] === '') {`
`434`	`434`	`return false;`
`435`	`435`	`}`
`436`	`436`	`}`