From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 16 Feb 2015 12:51:23 +0000 (+1300)
Subject: Tidy up - put civiExit in calling class
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=160c9df218194e34a492fa43883018532282c619;p=civicrm-core.git

Tidy up - put civiExit in calling class
---

diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index 004e26ab24..d41af48100 100644
--- 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();
-    }
   }
 
   /**