Skip to content

Changes for Composer #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackrabbithanna wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Changes for Composer #348

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf3f4aa
load ClassLoader from global
jackrabbithanna Jun 7, 2025
3e73a1b
try not requiring Classloader.php
jackrabbithanna Oct 16, 2025
1f71e1c
put back require Classloader.php
jackrabbithanna Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions includes/civicrm.admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Copy link
Copy Markdown
Member

@christianwach christianwach Jul 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jackrabbithanna Just wondering... perhaps this code could be removed completely? AFAICT the same code is run at the bottom of civicrm.settings.php so I'm not entirely sure why it's being run again.

Copy link
Copy Markdown
Contributor Author

@jackrabbithanna jackrabbithanna Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was a little hesitant to remove completely, as its been there for so long. This simply changes the order it happens

// Bail if the config file isn't found.
if (!file_exists($civicrm_root . 'CRM/Core/Config.php')) {
$this->error_flag = 'config-missing';
Expand Down