Commit 29c7efa1 authored by alexpott's avatar alexpott

Issue #2422243 by chx: WebTestBase breaks settings

parent 7d7114ee
......@@ -854,14 +854,14 @@ protected function setUp() {
// bootstrap into DRUPAL_BOOTSTRAP_CONFIGURATION (again). Hence, we have to
// reload the newly written custom settings.php manually.
$class_loader = require DRUPAL_ROOT . '/core/vendor/autoload.php';
Settings::initialize(DRUPAL_ROOT, $directory, $class_loader);
Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $class_loader);
// Execute the non-interactive installer.
require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
install_drupal($class_loader, $parameters);
// Import new settings.php written by the installer.
Settings::initialize(DRUPAL_ROOT, $directory, $class_loader);
Settings::initialize(DRUPAL_ROOT, $this->siteDirectory, $class_loader);
foreach ($GLOBALS['config_directories'] as $type => $path) {
$this->configDirectories[$type] = $path;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment