diff -u b/core/includes/install.inc b/core/includes/install.inc --- b/core/includes/install.inc +++ b/core/includes/install.inc @@ -171,19 +171,24 @@ * are dumped up to a .value key: * @code * $settings['config_directories'] = array( - * '.value' => array( - * CONFIG_ACTIVE_DIRECTORY => array( - * 'path' => 'config_' . $config_directories_hash . '/active', + * CONFIG_ACTIVE_DIRECTORY => array( + * 'path' => array( + * '.value' => 'config__hash/active' + * '.required' => TRUE, * ), - * CONFIG_STAGING_DIRECTORY => array( - * 'path' => 'config_' . $config_directories_hash . '/staging', + * ), + * CONFIG_STAGING_DIRECTORY => array( + * 'path' => array( + * '.value' => 'config_hash/staging', + * '.required' => TRUE, * ), - * ), - * '.required' => TRUE, + * ), * ); * @endcode * gets dumped as: * @code + * $config_directories['active']['path'] = 'config__hash/active'; + * $config_directories['staging']['path'] = 'config__hash/staging' * @endcode */ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) { @@ -426,15 +431,18 @@ if (empty($config_directories)) { $config_directories_hash = drupal_hash_base64(drupal_random_bytes(55)); $settings['config_directories'] = array( - '.value' => array( - CONFIG_ACTIVE_DIRECTORY => array( - 'path' => 'config_' . $config_directories_hash . '/active', + CONFIG_ACTIVE_DIRECTORY => array( + 'path' => array( + '.value' => 'config_' . $config_directories_hash . '/active', + '.required' => TRUE, ), - CONFIG_STAGING_DIRECTORY => array( - 'path' => 'config_' . $config_directories_hash . '/staging', + ), + CONFIG_STAGING_DIRECTORY => array( + 'path' => array( + '.value' => 'config_' . $config_directories_hash . '/staging', + '.required' => TRUE, ), ), - '.required' => TRUE, ); // Rewrite settings.php, which also sets the value as global variable. drupal_rewrite_settings($settings);