From 27acac3c7ec66691955d73d5a357618b5c8f4c2d Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 4 Mar 2021 08:30:43 -0500
Subject: [PATCH] Afform - simplify code to check if ext enabled

---
 ext/search/Civi/Search/Admin.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ext/search/Civi/Search/Admin.php b/ext/search/Civi/Search/Admin.php
index 711a8378ca..a03eb28761 100644
--- a/ext/search/Civi/Search/Admin.php
+++ b/ext/search/Civi/Search/Admin.php
@@ -24,6 +24,7 @@ class Admin {
    */
   public static function getAdminSettings():array {
     $schema = self::getSchema();
+    $extensions = \CRM_Extension_System::singleton()->getMapper();
     return [
       'schema' => $schema,
       'joins' => self::getJoins(array_column($schema, NULL, 'name')),
@@ -31,14 +32,8 @@ class Admin {
       'functions' => \CRM_Api4_Page_Api4Explorer::getSqlFunctions(),
       'displayTypes' => Display::getDisplayTypes(['id', 'name', 'label', 'description', 'icon']),
       'styles' => \CRM_Utils_Array::makeNonAssociative(self::getStyles()),
-      'afformEnabled' => (bool) \CRM_Utils_Array::findAll(
-        \CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(),
-        ['fullName' => 'org.civicrm.afform']
-      ),
-      'afformAdminEnabled' => (bool) \CRM_Utils_Array::findAll(
-        \CRM_Extension_System::singleton()->getMapper()->getActiveModuleFiles(),
-        ['fullName' => 'org.civicrm.afform_admin']
-      ),
+      'afformEnabled' => $extensions->isActiveModule('afform'),
+      'afformAdminEnabled' => $extensions->isActiveModule('afform_admin'),
     ];
   }
 
-- 
2.25.1