Skip to content
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

Jump to bottom

SettingsManager::bootSettings - fix providing CIVICRM_DSN directly on Standalone #31216

Merged
merged 1 commit into from
Oct 3, 2024
Merged

SettingsManager::bootSettings - fix providing CIVICRM_DSN directly on Standalone #31216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 3 deletions Civi/Core/SettingsManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,11 @@ public static function bootSettings($settingsPath) {
// file in order to:
// a) ensure the env values take precedence over define('CIVICRM_DSN'...) in the settings file
// b) provide the right source value for CIVICRM_LOGGING_DSN (set from CIVICRM_DSN in the settings file template)
$composedDsn = $bootSettingsManager->getBagByDomain(NULL)->get('civicrm_db_dsn');
if ($composedDsn) {
define('CIVICRM_DSN', $composedDsn);
if (!defined('CIVICRM_DSN')) {
$composedDsn = $bootSettingsManager->getBagByDomain(NULL)->get('civicrm_db_dsn');
if ($composedDsn) {
define('CIVICRM_DSN', $composedDsn);
}
}

if (file_exists($settingsPath)) {
Expand Down