From c3823480cdeed0702067463628b44e6734968964 Mon Sep 17 00:00:00 2001
From: benjamin <ben@civicrm.org>
Date: Fri, 20 Sep 2024 21:59:41 +0100
Subject: [PATCH] SettingsManager::bootSettings - dont try to redefine
 CIVICRM_DSN

---
 Civi/Core/SettingsManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Civi/Core/SettingsManager.php b/Civi/Core/SettingsManager.php
index 21d59277e620..a9387d46bdf4 100644
--- a/Civi/Core/SettingsManager.php
+++ b/Civi/Core/SettingsManager.php
@@ -431,7 +431,7 @@ public static function bootSettings($settingsPath) {
     // 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) {
+    if (!defined('CIVICRM_DSN') && $composedDsn) {
       define('CIVICRM_DSN', $composedDsn);
     }