CRM-14396 - CRM_Core_Payment::handlePaymentMethod - Fix 'not found' error

There are two ways to locate handler class -- one via isExtensionKey() and
one via "CRM_Core_{$className}".  Prior to this patch, the error would arise
even if a class was located via "CRM_Core_{$className}".

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index c9e004ac2b8680fb2f100661c882afa899e4c3d0..6afcf6379a6327fa64650bcf88bd6ec1be8a4c25 100644 (file)
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -255,7 +255,6 @@ abstract class CRM_Core_Payment {
       // Check pp is extension
       $ext = CRM_Extension_System::singleton()->getMapper();
       if ($ext->isExtensionKey($dao->class_name)) {
-        $extension_instance_found = TRUE;
         $paymentClass = $ext->keyToClass($dao->class_name, 'payment');
         require_once $ext->classToPath($paymentClass);
       }
@@ -288,6 +287,7 @@ abstract class CRM_Core_Payment {
 
       // Everything, it seems, is ok - execute pp callback handler
       $processorInstance->$method();
+      $extension_instance_found = TRUE;
     }
 
     if (!$extension_instance_found) CRM_Core_Error::fatal(