Use settings::get instead of $config object to retrieve enableComponents

diff --git a/CRM/Admin/Page/Admin.php b/CRM/Admin/Page/Admin.php
index c110c237abf975e83737d5dab62936b0c72d5ff5..95b72efd83b5e77a1280aedc19be981b01498866 100644 (file)
--- a/CRM/Admin/Page/Admin.php
+++ b/CRM/Admin/Page/Admin.php
@@ -36,10 +36,7 @@ class CRM_Admin_Page_Admin extends CRM_Core_Page {
       'System Settings' => ts('System Settings'),
     ];
 
-    $config = CRM_Core_Config::singleton();
-
-    foreach ($config->enableComponents as $component) {
-      $comp = CRM_Core_Component::get($component);
+    foreach (CRM_Core_Component::getEnabledComponents() as $comp) {
       $groups[$comp->info['name']] = $comp->info['translatedName'];
     }
 

diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php
index e3efbf286c0cd767e1b5b8b032710ca2802ad64e..63b0c781e71fa0b2dfb5186c1e63ce0c65301d24 100644 (file)
--- a/CRM/Core/Component.php
+++ b/CRM/Core/Component.php
@@ -421,7 +421,7 @@ class CRM_Core_Component {
    *   Is the component enabled.
    */
   public static function isEnabled(string $component): bool {
-    return in_array($component, CRM_Core_Config::singleton()->enableComponents, TRUE);
+    return in_array($component, Civi::settings()->get('enable_components'), TRUE);
   }
 
 }

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index b0701cc5f2cb2211713464f9f7289267df8326dd..f3256090e71ed4faa892ac5b760d34b20c3f1095 100644 (file)
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -145,7 +145,7 @@ WHERE  v.option_group_id = g.id
       $query .= ' AND  v.is_active = 1 ';
       // Only show options for enabled components
       $componentClause = ' v.component_id IS NULL ';
-      $enabledComponents = CRM_Core_Config::singleton()->enableComponents;
+      $enabledComponents = Civi::settings()->get('enable_components');
       if ($enabledComponents) {
         $enabledComponents = '"' . implode('","', $enabledComponents) . '"';
         $componentClause .= " OR v.component_id IN (SELECT id FROM civicrm_component WHERE name IN ($enabledComponents)) ";

diff --git a/CRM/Utils/VersionCheck.php b/CRM/Utils/VersionCheck.php
index 56da0c7564ecfdface8596e7dbf14041e4e14423..9d0781a7a4d7bda7cbbea8abf84e529c31615431 100644 (file)
--- a/CRM/Utils/VersionCheck.php
+++ b/CRM/Utils/VersionCheck.php
@@ -227,8 +227,7 @@ class CRM_Utils_VersionCheck {
    */
   private function getExtensionStats() {
     // Core components
-    $config = CRM_Core_Config::singleton();
-    foreach ($config->enableComponents as $comp) {
+    foreach (Civi::settings()->get('enable_components') as $comp) {
       $this->stats['extensions'][] = [
         'name' => 'org.civicrm.component.' . strtolower($comp),
         'enabled' => 1,