MAGETWO-56695: Paypal checkout not possible with products that have custom options #5938 - for 2.1

ameysar · ameysar · commit 163efaee2382 · 2016-11-07T09:16:38.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
@@ -1905,15 +1905,18 @@ public function addOption(Product\Option $option)
      */
     public function getOptionById($optionId)
     {
+        $result = null;
         if (is_array($this->getOptions())) {
             /** @var \Magento\Catalog\Model\Product\Option $option */
             foreach ($this->getOptions() as $option) {
                 if ($option->getId() == $optionId) {
-                    return $option;
+                    $result = $option;
+                    break;
                 }
             }
         }
-        return null;
+
+        return $result;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1905,15 +1905,18 @@ public function addOption(Product\Option $option)`
`1905`	`1905`	`*/`
`1906`	`1906`	`public function getOptionById($optionId)`
`1907`	`1907`	`{`
	`1908`	`+ $result = null;`
`1908`	`1909`	`if (is_array($this->getOptions())) {`
`1909`	`1910`	`/** @var \Magento\Catalog\Model\Product\Option $option */`
`1910`	`1911`	`foreach ($this->getOptions() as $option) {`
`1911`	`1912`	`if ($option->getId() == $optionId) {`
`1912`		`- return $option;`
	`1913`	`+ $result = $option;`
	`1914`	`+ break;`
`1913`	`1915`	`}`
`1914`	`1916`	`}`
`1915`	`1917`	`}`
`1916`		`- return null;`
	`1918`	`+`
	`1919`	`+ return $result;`
`1917`	`1920`	`}`
`1918`	`1921`
`1919`	`1922`	`/**`