diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 00c3445..a777d34 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2269,7 +2269,7 @@ function install_display_requirements($install_state, $requirements) { /** * Installation task; ensures install profile is written to settings.php. * - * @param $install_state + * @param array $install_state * An array of information about the current installation state. */ function install_write_profile($install_state) { diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php index 384a8f1..25be1ef 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php @@ -31,8 +31,8 @@ protected function setUp() { 'required' => TRUE, ); - // Actually the install profile should be skipped to because it is written - // to settings.php. + // During interactive install we'll change this to a different profile and + // this test will ensure that the new value is written to settings.php. $this->settings['settings']['install_profile'] = (object) array( 'value' => 'minimal', 'required' => TRUE, diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 69ad74e..ad00ee2 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -246,12 +246,14 @@ $config_directories = array(); /** - * The currently active installation profile. + * The active installation profile. * - * If this is set prior to installation this value will used regardless of any - * parameters passed to install_drupal(). Changing this after installation is - * not recommended as it changes which directories are scanned during extension - * discovery. + * Changing this after installation is not recommended as it changes which + * directories are scanned during extension discovery. If this is set prior to + * installation this value will be rewritten according to the profile selected + * by the user. + * + * @see install_select_profile() */ # $install_profile = '';