CRM-16373 - Config - Remove `componentRegistry`

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 0d6e5f80c747359e2beeca98adaa965ddb45a53d..4fe4f2d0bc0d58dac58cc6c529c9ea15876bd13e 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -140,11 +140,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
    */
   private static $_singleton = NULL;
 
-  /**
-   * @var CRM_Core_Component
-   */
-  public $componentRegistry = NULL;
-
   ///
   /// END HELPER CLASS PROPERTIES
   ///
@@ -386,11 +381,6 @@ class CRM_Core_Config extends CRM_Core_Config_Variables {
 
     // also initialize the logger
     self::$_log = Log::singleton('display');
-
-    // initialize component registry early to avoid "race"
-    // between CRM_Core_Config and CRM_Core_Component (they
-    // are co-dependant)
-    $this->componentRegistry = new CRM_Core_Component();
   }
 
   /**

diff --git a/CRM/Core/Config/Variables.php b/CRM/Core/Config/Variables.php
index baf6c6f4db51f3411b4b4ffb194a241559894a1f..7f69eb5001596331adc35cb63618688beee28d10 100644 (file)
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -385,11 +385,6 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   public $inCiviCRM = FALSE;
 
-  /**
-   * Component registry object (of CRM_Core_Component type)
-   */
-  public $componentRegistry = NULL;
-
   /**
    * PDF receipt as attachment is disabled by default (CRM-8350)
    */