ENGCOM-3236: Prevent exception when option text converts to false #18720

Stanislav Idolov · web-flow · commit cce380b66b01 · 2018-10-26T08:59:54.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -141,7 +141,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(
                 __(
                     'The "%1" attribute doesn\'t include an option with "%2" ID.',

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function getItems($entityType, $attributeCode)`
`141`	`141`	`*/`
`142`	`142`	`protected function validateOption($attribute, $optionId)`
`143`	`143`	`{`
`144`		`- if (!$attribute->getSource()->getOptionText($optionId)) {`
	`144`	`+ if ($attribute->getSource()->getOptionText($optionId) === false) {`
`145`	`145`	`throw new NoSuchEntityException(`
`146`	`146`	`__(`
`147`	`147`	`'The "%1" attribute doesn\'t include an option with "%2" ID.',`