Skip to content

Commit

Permalink
Use full setting path rather than relative
Browse files Browse the repository at this point in the history
This makes the setting of CIVICRM_SETTINGS_PATH consistent with other places
and addresses a build bug
  • Loading branch information
eileenmcnaughton committed Jul 27, 2023
1 parent 9ba8e6d commit ef04010
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion civicrm.module
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down

0 comments on commit ef04010

Please sign in to comment.