Add patch for magento/magento2#10266

ConvertGroupsAS · Nov 23, 2017 · abcbff0 · abcbff0
1 parent bf741e2
commit abcbff0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Patch-Magento_Swatches-M2.1.x-zero-value-attribute-options-fix.patch b/Patch-Magento_Swatches-M2.1.x-zero-value-attribute-options-fix.patch
@@ -0,0 +1,11 @@
+--- Model/Plugin/EavAttribute.php
++++ Model/Plugin/EavAttribute.php
+@@ -430,7 +430,7 @@ class EavAttribute
+ if ($this->isOptionForDelete($attribute, $optionId)) {
+ continue;
+ }
+- if (empty($option[0])) {
++ if (!isset($option[0]) || $option[0] === '') {
+ return false;
+ }
+ }
diff --git a/README.md b/README.md
@@ -64,7 +64,8 @@ Full example:
  "Fix: https://github.com/magento/magento2/issues/6762": "https://raw.githubusercontent.com/ConvertGroupsAS/magento2-patches/master/Patch-Magento_SalesRule-M2.1.6-fix-to-date-parameter.patch"
  },
  "magento/module-swatches": {
- "Fix: Add ability to set visual swatch by store ID as well as textual one": "https://raw.githubusercontent.com/ConvertGroupsAS/magento2-patches/master/Patch-Magento_Swatches-rest-api-visual-swatches-fix.patch"
+ "Fix: Add ability to set visual swatch by store ID as well as textual one": "https://raw.githubusercontent.com/ConvertGroupsAS/magento2-patches/master/Patch-Magento_Swatches-rest-api-visual-swatches-fix.patch",
+ "Fix: https://github.com/magento/magento2/issues/10266": "https://raw.githubusercontent.com/ConvertGroupsAS/magento2-patches/master/Patch-Magento_Swatches-M2.1.x-zero-value-attribute-options-fix.patch"
  },
  "magento/module-tax": {
  "Fix: https://github.com/magento/magento2/issues/2939": "https://raw.githubusercontent.com/ConvertGroupsAS/magento2-patches/master/Patch-Magento-Tax-M2.1.0-free-shipping-availability-on-backend.patch"