diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index b2c4f3d..00c3445 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1180,10 +1180,6 @@ function install_select_profile(&$install_state) { * selected. */ function _install_select_profile(&$install_state) { - // Use install profile from settings.php if it is set already. - if ($existing_profile = Settings::get('install_profile')) { - return $existing_profile; - } // Don't need to choose profile if only one available. if (count($install_state['profiles']) == 1) { return key($install_state['profiles']); diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php index 3027d76..384a8f1 100644 --- a/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerExistingSettingsTest.php @@ -34,7 +34,7 @@ protected function setUp() { // Actually the install profile should be skipped to because it is written // to settings.php. $this->settings['settings']['install_profile'] = (object) array( - 'value' => 'testing', + 'value' => 'minimal', 'required' => TRUE, ); @@ -68,14 +68,6 @@ protected function setUp() { /** * {@inheritdoc} */ - protected function setUpProfile() { - // This step should not appear, since settings.php is fully configured - // already. - } - - /** - * {@inheritdoc} - */ protected function setUpSettings() { // This step should not appear, since settings.php is fully configured // already. @@ -87,6 +79,7 @@ protected function setUpSettings() { public function testInstaller() { $this->assertUrl('user/1'); $this->assertResponse(200); + $this->assertEqual('testing', drupal_get_profile(), 'Profile was changed from minimal to testing during interactive install.'); } }