From e96388410a00fefb63ddf8bfcc66f049c3174df5 Mon Sep 17 00:00:00 2001 From: "v.sikailo" Date: Fri, 7 Dec 2018 12:05:35 +0200 Subject: [PATCH 1/3] Added strict flag to in_array --- .../Catalog/Model/Product/Attribute/OptionManagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php index f2039a5002dcc..6cca2c07e2dd8 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php @@ -47,7 +47,7 @@ public function add($attributeCode, $option) /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */ $attributeOption = $attributeOption->getLabel(); }); - if (in_array($option->getLabel(), $currentOptions)) { + if (in_array($option->getLabel(), $currentOptions, true)) { return false; } } From f1dc26c3ee020397946bfc559ed8c81b5b31bfbd Mon Sep 17 00:00:00 2001 From: "v.sikailo" Date: Fri, 7 Dec 2018 12:08:17 +0200 Subject: [PATCH 2/3] Revert "Added strict flag to in_array" This reverts commit e96388410a00fefb63ddf8bfcc66f049c3174df5. --- .../Catalog/Model/Product/Attribute/OptionManagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php index 6cca2c07e2dd8..f2039a5002dcc 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php @@ -47,7 +47,7 @@ public function add($attributeCode, $option) /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */ $attributeOption = $attributeOption->getLabel(); }); - if (in_array($option->getLabel(), $currentOptions, true)) { + if (in_array($option->getLabel(), $currentOptions)) { return false; } } From f3f01d50c3dc8ca8c42e2908c42e5374ac0d911a Mon Sep 17 00:00:00 2001 From: "v.sikailo" Date: Fri, 7 Dec 2018 12:09:18 +0200 Subject: [PATCH 3/3] Added strict flag to in_array --- .../Catalog/Model/Product/Attribute/OptionManagement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php index f2039a5002dcc..6cca2c07e2dd8 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php @@ -47,7 +47,7 @@ public function add($attributeCode, $option) /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */ $attributeOption = $attributeOption->getLabel(); }); - if (in_array($option->getLabel(), $currentOptions)) { + if (in_array($option->getLabel(), $currentOptions, true)) { return false; } }