Commit 831c2dee authored by Helmut Hummel's avatar Helmut Hummel Committed by Morton Jonuschat
Browse files

[BUGFIX] Set correct DB configuration in step installer

After the doctrine merge, the configuration for the database name changed.
Reflect this also in the database select step, when the user chooses
to select an empty existing database.

Releases: master
Resolves: #75961
Change-Id: Ie49bf42dd2142736c4d99fe8297b688e833e1a23
Reviewed-on: https://review.typo3.org/47949


Reviewed-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes's avatarNicole Cordes <typo3@cordes.co>
Reviewed-by: default avatarMorton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: default avatarMorton Jonuschat <m.jonuschat@mojocode.de>
parent c03be605
......@@ -78,7 +78,7 @@ class DatabaseSelect extends AbstractStepAction
$existingTables = $this->databaseConnection->admin_get_tables();
$isInitialInstallation = $configurationManager->getConfigurationValueByPath('SYS/isInitialInstallationInProgress');
if (!$isInitialInstallation || empty($existingTables)) {
$localConfigurationPathValuePairs['DB/database'] = $postValues['existing'];
$localConfigurationPathValuePairs['DB/Connections/Default/dbname'] = $postValues['existing'];
}
// check if database charset is utf-8
$defaultDatabaseCharset = $this->getDefaultDatabaseCharset();
......
Supports Markdown
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