Merge pull request #16702 from seamuslee001/5.24

bin/*, extern/* - Fix leak of "$config" in global namespace
civicrm · Mar 23, 2020 · 27a591c · 27a591c
2 parents db6701e + d523d24
commit 27a591c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.