From cf3f4aaea87f482b4faa46382db610c3c7c7bd06 Mon Sep 17 00:00:00 2001 From: Mark Hanna Date: Fri, 6 Jun 2025 22:04:18 -0600 Subject: [PATCH 1/3] load ClassLoader from global --- includes/civicrm.admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/civicrm.admin.php b/includes/civicrm.admin.php index e43a1fd..ef94c6b 100644 --- a/includes/civicrm.admin.php +++ b/includes/civicrm.admin.php @@ -416,13 +416,13 @@ public function initialize() { return FALSE; } - // Initialize the Class Loader. - require_once CIVICRM_PLUGIN_DIR . 'civicrm/CRM/Core/ClassLoader.php'; - CRM_Core_ClassLoader::singleton()->register(); - // Access global defined in "civicrm.settings.php". global $civicrm_root; + // Initialize the Class Loader. + require_once $civicrm_root . 'CRM/Core/ClassLoader.php'; + CRM_Core_ClassLoader::singleton()->register(); + // Bail if the config file isn't found. if (!file_exists($civicrm_root . 'CRM/Core/Config.php')) { $this->error_flag = 'config-missing'; From 3e73a1be807e65a5e9f30077d7b643e560e57ad7 Mon Sep 17 00:00:00 2001 From: Mark Hanna Date: Wed, 15 Oct 2025 19:43:41 -0600 Subject: [PATCH 2/3] try not requiring Classloader.php --- includes/civicrm.admin.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/includes/civicrm.admin.php b/includes/civicrm.admin.php index ef94c6b..bb04a64 100644 --- a/includes/civicrm.admin.php +++ b/includes/civicrm.admin.php @@ -419,10 +419,6 @@ public function initialize() { // Access global defined in "civicrm.settings.php". global $civicrm_root; - // Initialize the Class Loader. - require_once $civicrm_root . 'CRM/Core/ClassLoader.php'; - CRM_Core_ClassLoader::singleton()->register(); - // Bail if the config file isn't found. if (!file_exists($civicrm_root . 'CRM/Core/Config.php')) { $this->error_flag = 'config-missing'; From 1f71e1c59fa92ee169a8c867e5acca8b543186a5 Mon Sep 17 00:00:00 2001 From: Mark Hanna Date: Thu, 16 Oct 2025 08:32:30 -0600 Subject: [PATCH 3/3] put back require Classloader.php --- includes/civicrm.admin.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/civicrm.admin.php b/includes/civicrm.admin.php index bb04a64..ef94c6b 100644 --- a/includes/civicrm.admin.php +++ b/includes/civicrm.admin.php @@ -419,6 +419,10 @@ public function initialize() { // Access global defined in "civicrm.settings.php". global $civicrm_root; + // Initialize the Class Loader. + require_once $civicrm_root . 'CRM/Core/ClassLoader.php'; + CRM_Core_ClassLoader::singleton()->register(); + // Bail if the config file isn't found. if (!file_exists($civicrm_root . 'CRM/Core/Config.php')) { $this->error_flag = 'config-missing';