MAGETWO-66417: Issue/6706 #6707

vrann · vrann · commit 6152f875eea6 · 2017-03-20T19:16:21.000-07:00
- Merge Pull Request #6707 from PascalBrouwers/magento2:issue/6706
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -186,7 +186,9 @@ protected function prepareOptionIds(array $optionsArray)
     {
         if (isset($optionsArray['value']) && is_array($optionsArray['value'])) {
             foreach (array_keys($optionsArray['value']) as $optionId) {
-                if (isset($optionsArray['delete']) && $optionsArray['delete'][$optionId] == 1) {
+                if (isset($optionsArray['delete']) && isset($optionsArray['delete'][$optionId])
+                    && $optionsArray['delete'][$optionId] == 1
+                ) {
                     unset($optionsArray['value'][$optionId]);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,9 @@ protected function prepareOptionIds(array $optionsArray)`
`186`	`186`	`{`
`187`	`187`	`if (isset($optionsArray['value']) && is_array($optionsArray['value'])) {`
`188`	`188`	`foreach (array_keys($optionsArray['value']) as $optionId) {`
`189`		`- if (isset($optionsArray['delete']) && $optionsArray['delete'][$optionId] == 1) {`
	`189`	`+ if (isset($optionsArray['delete']) && isset($optionsArray['delete'][$optionId])`
	`190`	`+ && $optionsArray['delete'][$optionId] == 1`
	`191`	`+ ) {`
`190`	`192`	`unset($optionsArray['value'][$optionId]);`
`191`	`193`	`}`
`192`	`194`	`}`