diff -u b/core/includes/install.inc b/core/includes/install.inc --- b/core/includes/install.inc +++ b/core/includes/install.inc @@ -178,19 +178,19 @@ * @code * $settings['config_directories'] = array( * CONFIG_ACTIVE_DIRECTORY => (object) array( - * 'value' => conf_path() . '/files/config_hash/active', + * 'value' => 'config_hash/active' * 'required' => TRUE, * ), * CONFIG_STAGING_DIRECTORY => (object) array( - * 'value' => conf_path() . '/files/config_hash/staging', + * 'value' => 'config_hash/staging', * 'required' => TRUE, * ), * ); * @endcode * gets dumped as: * @code - * $config_directories['active'] = 'config__hash/active'; - * $config_directories['staging'] = 'config__hash/staging' + * $config_directories['active'] = 'config_hash/active'; + * $config_directories['staging'] = 'config_hash/staging' * @endcode */ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) { only in patch2: unchanged: --- a/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Installer/InstallerTranslationTest.php @@ -108,9 +108,8 @@ protected function setUp() { // Reload config directories. include $this->public_files_directory . '/settings.php'; - $prefix = substr($this->public_files_directory, strlen(conf_path() . '/files/')); - foreach ($config_directories as $type => $data) { - $GLOBALS['config_directories'][$type]['path'] = $prefix . '/files/' . $data['path']; + foreach ($config_directories as $type => $path) { + $GLOBALS['config_directories'][$type] = $path; } $this->rebuildContainer(); only in patch2: unchanged: --- a/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/InstallerTest.php @@ -82,9 +82,8 @@ protected function setUp() { $this->drupalPostForm(NULL, array(), 'Save and continue'); // Reload config directories. include $this->public_files_directory . '/settings.php'; - $prefix = substr($this->public_files_directory, strlen(conf_path() . '/files/')); - foreach ($config_directories as $type => $data) { - $GLOBALS['config_directories'][$type]['path'] = $prefix . '/files/' . $data['path']; + foreach ($config_directories as $type => $path) { + $GLOBALS['config_directories'][$type] = $path; } $this->rebuildContainer();