PHP8.1: Fixed passing null to trim() for non-existing payment methods (#2939)

sreichel · web-flow · commit 0136fa533281 · 2023-01-15T10:36:18.000Z
diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php
@@ -43,6 +43,10 @@ public function getMethodInstance($code)
     {
         $key = self::XML_PATH_PAYMENT_METHODS . '/' . $code . '/model';
         $class = Mage::getStoreConfig($key);
+        if (is_null($class)) {
+            Mage::logException(new Exception(sprintf('Unkown payment method with code "%s"', $code)));
+            return false;
+        }
         return Mage::getModel($class);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,10 @@ public function getMethodInstance($code)`
`43`	`43`	`{`
`44`	`44`	`$key = self::XML_PATH_PAYMENT_METHODS . '/' . $code . '/model';`
`45`	`45`	`$class = Mage::getStoreConfig($key);`
	`46`	`+ if (is_null($class)) {`
	`47`	`+ Mage::logException(new Exception(sprintf('Unkown payment method with code "%s"', $code)));`
	`48`	`+ return false;`
	`49`	`+ }`
`46`	`50`	`return Mage::getModel($class);`
`47`	`51`	`}`
`48`	`52`