Tidy up - put civiExit in calling class

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 004e26ab244ba162f4c8940c692421b25c0b0974..d41af48100a39082f9e15db9cc7dd2adf1082988 100644 (file)
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -519,6 +519,7 @@ abstract class CRM_Core_Payment {
         'mode' => @$_GET['mode'],
       )
     );
+    CRM_Utils_System::civiExit();
   }
 
   /**
@@ -618,11 +619,6 @@ abstract class CRM_Core_Payment {
         "$method method is unsupported in legacy payment processors."
       );
     }
-
-    // Exit here on web requests, allowing just the plain text response to be echoed
-    if ($method == 'handlePaymentNotification') {
-      CRM_Utils_System::civiExit();
-    }
   }
 
   /**