Merge pull request #9230 from totten/master-req2

[civicrm-core.git] / extern / ipn.php

diff --git a/extern/ipn.php b/extern/ipn.php
index 752bb1a1c41f3cc9be39d2f362cf1ff6153a82d3..3974cdc392081993a20e4b0b9a11e2317c76f75e 100644 (file)
--- a/extern/ipn.php
+++ b/extern/ipn.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,7 +27,7 @@
 
 /**
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  */
 
@@ -48,10 +48,14 @@ if (empty($_GET)) {
 }
 else {
   $log->alert('payment_notification PayPal_Standard', $_REQUEST);
-  $paypalIPN = new CRM_Core_Payment_PayPalIPN();
+  $paypalIPN = new CRM_Core_Payment_PayPalIPN($_REQUEST);
   // @todo upgrade standard per Pro
 }
 try {
+  //CRM-18245
+  if ($config->userFramework == 'Joomla') {
+    CRM_Utils_System::loadBootStrap();
+  }
   $paypalIPN->main();
 }
 catch (CRM_Core_Exception $e) {