From e20d7439e4a4ad250f835e1ef3df470f4363fd61 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 28 Apr 2023 10:18:56 -0400
Subject: [PATCH] Use settings::get instead of $config object to retrieve
 enableComponents

---
 CRM/Admin/Page/Admin.php   | 5 +----
 CRM/Core/Component.php     | 2 +-
 CRM/Core/OptionGroup.php   | 2 +-
 CRM/Utils/VersionCheck.php | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CRM/Admin/Page/Admin.php b/CRM/Admin/Page/Admin.php
index c110c237ab..95b72efd83 100644
--- 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 e3efbf286c..63b0c781e7 100644
--- 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 b0701cc5f2..f3256090e7 100644
--- 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 56da0c7564..9d0781a7a4 100644
--- 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,
-- 
2.25.1