CRM_Core_BAO_ConfigSetting - Support components from extensions

diff --git a/CRM/Core/BAO/ConfigSetting.php b/CRM/Core/BAO/ConfigSetting.php
index 3a5ff2a507ca8ec463ff75f4f98bf500a4625929..2183dbaff6c617c7a1c402058af2bddb5d75cafb 100644 (file)
--- a/CRM/Core/BAO/ConfigSetting.php
+++ b/CRM/Core/BAO/ConfigSetting.php
@@ -347,10 +347,12 @@ class CRM_Core_BAO_ConfigSetting {
       if (!empty($enableComponents)) {
         $defaults['enableComponents'] = $enableComponents;
 
-        $components = CRM_Core_Component::getComponents();
+        // Lookup component IDs. Note: Do *not* instantiate components.
+        // Classloading may not be fully setup yet.
+        $components = CRM_Core_Component::getComponentIDs();
         $enabledComponentIDs = array();
         foreach ($defaults['enableComponents'] as $name) {
-          $enabledComponentIDs[] = $components[$name]->componentID;
+          $enabledComponentIDs[] = $components[$name];
         }
         $defaults['enableComponentIDs'] = $enabledComponentIDs;
       }

diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php
index 9f099617fd9fa7f62429fc9f88affc9342e620f5..da70a18ef1271d96a814781a838e12e42bf445dc 100644 (file)
--- a/CRM/Core/Component.php
+++ b/CRM/Core/Component.php
@@ -112,6 +112,23 @@ class CRM_Core_Component {
     return $_cache;
   }
 
+  /**
+   * @return array
+   *   Array(string $name => int $id).
+   */
+  public static function &getComponentIDs() {
+    $componentIDs = array();
+
+    $cr = new CRM_Core_DAO_Component();
+    $cr->find(FALSE);
+    while ($cr->fetch()) {
+      $componentIDs[$cr->name] = $cr->id;
+    }
+
+    return $componentIDs;
+  }
+
+
   /**
    * @param bool $force
    *