Merge pull request #18843 from bluehorndigital/dev/core-2140

dev/core#2140 Fix site path for Drupal 8 and 9
civicrm · Oct 22, 2020 · 3c5b905 · 3c5b905
2 parents b5f4c7d + eb401bd
commit 3c5b905
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/setup/plugins/init/Drupal8.civi-setup.php b/setup/plugins/init/Drupal8.civi-setup.php
@@ -32,7 +32,7 @@
 
     // Compute settingsPath.
     $siteDir = \Civi\Setup\DrupalUtil::getDrupalSiteDir($cmsPath);
-    $model->settingsPath = implode(DIRECTORY_SEPARATOR, [$cmsPath, 'sites', $siteDir, 'civicrm.settings.php']);
+    $model->settingsPath = implode(DIRECTORY_SEPARATOR, [$cmsPath, $siteDir, 'civicrm.settings.php']);
 
     if (($loadGenerated = \Drupal\Core\Site\Settings::get('civicrm_load_generated', NULL)) !== NULL) {
       $model->loadGenerated = $loadGenerated;

diff --git a/setup/src/Setup/DrupalUtil.php b/setup/src/Setup/DrupalUtil.php
@@ -20,7 +20,7 @@ public static function getDrupalSiteDir($cmsPath) {
       return basename(conf_path());
     }
     elseif (class_exists('Drupal')) {
-      return basename(\Drupal::service('site.path'));
+      return \Drupal::service('site.path');
     }
     else {
       throw new \Exception('Cannot detect path under Drupal "sites/".');