ENGCOM-1512: Add missing false-check to the ConfiguredRegularPrice price-model #15129

magento-engcom-team · magento-engcom-team · commit 774e26222b6a · 2018-05-10T07:18:17.000-05:00
- Merge Pull Request #15129 from tkotosz/magento2:bug/add-missing-false-check-for-price-model - Merged commits: 1. cebc94c 2. 654b468
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredRegularPrice.php
@@ -70,7 +70,8 @@ public function setItem(ItemInterface $item)
     public function getValue()
     {
         $basePrice = parent::getValue();
-        return $this->item
+
+        return ($this->item && $basePrice !== false)
             ? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)
             : $basePrice;
     }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ public function setItem(ItemInterface $item)`
`70`	`70`	`public function getValue()`
`71`	`71`	`{`
`72`	`72`	`$basePrice = parent::getValue();`
`73`		`- return $this->item`
	`73`	`+`
	`74`	`+ return ($this->item && $basePrice !== false)`
`74`	`75`	`? $basePrice + $this->configuredOptions->getItemOptionsValue($basePrice, $this->item)`
`75`	`76`	`: $basePrice;`
`76`	`77`	`}`