ENGCOM-3313: [Backport] Prevent exception when option text converts to false #18873

magento-engcom-team · magento-engcom-team · commit a8207f96516e · 2018-10-28T18:10:20.000-05:00
- Merge Pull Request #18873 from gelanivishal/magento2:2.2-develop-PR-port-18720 - Merged commits: 1. 06ca13a
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -132,7 +132,7 @@ public function getItems($entityType, $attributeCode)
      */
     protected function validateOption($attribute, $optionId)
     {
-        if (!$attribute->getSource()->getOptionText($optionId)) {
+        if ($attribute->getSource()->getOptionText($optionId) === false) {
             throw new NoSuchEntityException(
                 __('Attribute %1 does not contain option with Id %2', $attribute->getAttributeCode(), $optionId)
             );

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public function getItems($entityType, $attributeCode)`
`132`	`132`	`*/`
`133`	`133`	`protected function validateOption($attribute, $optionId)`
`134`	`134`	`{`
`135`		`- if (!$attribute->getSource()->getOptionText($optionId)) {`
	`135`	`+ if ($attribute->getSource()->getOptionText($optionId) === false) {`
`136`	`136`	`throw new NoSuchEntityException(`
`137`	`137`	`__('Attribute %1 does not contain option with Id %2', $attribute->getAttributeCode(), $optionId)`
`138`	`138`	`);`