From ef040101e4f86a3e7c3375364b4ec54a7d061f2e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 27 Jul 2023 12:01:55 +1200
Subject: [PATCH] Use full setting path rather than relative

This makes the setting of CIVICRM_SETTINGS_PATH consistent with other places
and addresses a build bug
---
 civicrm.module | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/civicrm.module b/civicrm.module
index f6dc8a20f..811c2f888 100644
--- a/civicrm.module
+++ b/civicrm.module
@@ -179,9 +179,10 @@ function civicrm_initialize() {
 
   if (!$initialized) {
     if (function_exists('conf_path')) {
-      $settingsFile = conf_path() . '/civicrm.settings.php';
+      $settingsFile = DRUPAL_ROOT . '/' . conf_path() . '/civicrm.settings.php';
     }
     else {
+      // @todo - ensure this is not providing a relative path
       $settingsFile = conf_init() . '/civicrm.settings.php';
     }
     if (!defined('CIVICRM_SETTINGS_PATH')) {