From d523d24ac33eaa0762f02e3038e23edcfeff2882 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 7 Mar 2020 08:55:52 +1100
Subject: [PATCH] [REF] Remove  variable from preboot locations to fix
 compataiblity with backdrop

---
 bin/ContributionProcessor.php | 2 +-
 bin/cron.php                  | 2 +-
 extern/authorizeIPN.php       | 2 +-
 extern/cxn.php                | 2 +-
 extern/ipn.php                | 2 +-
 extern/open.php               | 2 +-
 extern/pxIPN.php              | 2 +-
 extern/rest.php               | 2 +-
 extern/soap.php               | 4 ++--
 extern/url.php                | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/ContributionProcessor.php b/bin/ContributionProcessor.php
index cf3323b5c10d..a3a22d632cbe 100644
--- a/bin/ContributionProcessor.php
+++ b/bin/ContributionProcessor.php
@@ -463,7 +463,7 @@ public static function processAPIContribution($params) {
 session_start();
 require_once '../civicrm.config.php';
 require_once 'CRM/Core/Config.php';
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 
 CRM_Utils_System::authenticateScript(TRUE);
 
diff --git a/bin/cron.php b/bin/cron.php
index 8883550f8377..295af38a222f 100644
--- a/bin/cron.php
+++ b/bin/cron.php
@@ -13,7 +13,7 @@
 require_once '../civicrm.config.php';
 require_once 'CRM/Core/Config.php';
 require_once 'CRM/Utils/Request.php';
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 
 CRM_Utils_System::authenticateScript(TRUE);
 
diff --git a/extern/authorizeIPN.php b/extern/authorizeIPN.php
index 7c81b3b3d5fb..f552926fd458 100644
--- a/extern/authorizeIPN.php
+++ b/extern/authorizeIPN.php
@@ -21,7 +21,7 @@
 session_start();
 
 require_once '../civicrm.config.php';
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 $log = new CRM_Utils_SystemLogger();
 $log->alert('payment_notification processor_name=AuthNet', $_REQUEST);
 
diff --git a/extern/cxn.php b/extern/cxn.php
index d3db784a5f8e..62ecfeb39521 100644
--- a/extern/cxn.php
+++ b/extern/cxn.php
@@ -10,7 +10,7 @@
  */
 
 require_once '../civicrm.config.php';
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 
 CRM_Utils_System::loadBootStrap(array(), FALSE);
 
diff --git a/extern/ipn.php b/extern/ipn.php
index e79d1257dc86..d658dafcecb7 100644
--- a/extern/ipn.php
+++ b/extern/ipn.php
@@ -47,7 +47,7 @@
 
 /* Cache the real UF, override it with the SOAP environment */
 
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 $log = new CRM_Utils_SystemLogger();
 if (empty($_GET)) {
   $log->alert('payment_notification processor_name=PayPal', $_REQUEST);
diff --git a/extern/open.php b/extern/open.php
index b5db5f7e70e3..2b883362063d 100644
--- a/extern/open.php
+++ b/extern/open.php
@@ -6,7 +6,7 @@
 require_once 'CRM/Utils/Rule.php';
 require_once 'CRM/Utils/Request.php';
 
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 $queue_id = CRM_Utils_Request::retrieveValue('q', 'Positive', NULL, FALSE, 'GET');
 if (!$queue_id) {
   echo "Missing input parameters\n";
diff --git a/extern/pxIPN.php b/extern/pxIPN.php
index 1c4ab281e8cf..6ef2a57bf8e8 100644
--- a/extern/pxIPN.php
+++ b/extern/pxIPN.php
@@ -18,7 +18,7 @@
 require_once '../civicrm.config.php';
 require_once 'CRM/Core/Config.php';
 
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 $log = new CRM_Utils_SystemLogger();
 $log->alert('payment_notification processor_name=Payment_Express', $_REQUEST);
 /*
diff --git a/extern/rest.php b/extern/rest.php
index 39d24189068b..f87ace493c69 100644
--- a/extern/rest.php
+++ b/extern/rest.php
@@ -10,7 +10,7 @@
  */
 
 require_once '../civicrm.config.php';
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 
 if (defined('PANTHEON_ENVIRONMENT')) {
   ini_set('session.save_handler', 'files');
diff --git a/extern/soap.php b/extern/soap.php
index 578a879ba0c6..fcd2318d66ce 100644
--- a/extern/soap.php
+++ b/extern/soap.php
@@ -30,9 +30,9 @@
 
 /* Cache the real UF, override it with the SOAP environment */
 
-$config = CRM_Core_Config::singleton();
+$civicrmConfig = CRM_Core_Config::singleton();
 
-$server->setClass('CRM_Utils_SoapServer', $config->userFrameworkClass);
+$server->setClass('CRM_Utils_SoapServer', $civicrmConfig->userFrameworkClass);
 
 $server->setPersistence(SOAP_PERSISTENCE_SESSION);
 
diff --git a/extern/url.php b/extern/url.php
index 4c89886e4e61..5254a5974342 100644
--- a/extern/url.php
+++ b/extern/url.php
@@ -4,7 +4,7 @@
 require_once 'CRM/Core/Error.php';
 require_once 'CRM/Utils/Array.php';
 
-$config = CRM_Core_Config::singleton();
+CRM_Core_Config::singleton();
 
 // To keep backward compatibility for URLs generated
 // by CiviCRM < 1.7, we check for the q variable as well.