tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6490 from colintucker/fix-empty-db-installer-bug

Browse Source 
Check if $database is empty before adding prefix/suffix
This commit is contained in:
Loz Calver 2017-01-12 09:31:29 +00:00 committed by GitHub
commit 3e95fc51f7
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/ConfigureFromEnv.php
View File

@ -99,15 +99,25 @@ if (!isset($database) || !$database) {
if (defined('SS_DATABASE_USERNAME') && defined('SS_DATABASE_PASSWORD')) { if (defined('SS_DATABASE_USERNAME') && defined('SS_DATABASE_PASSWORD')) {
global $databaseConfig; global $databaseConfig;
// Checks if the database global is defined (if present, wraps with prefix and suffix)
$databaseNameWrapper = function ($name) {
if (!$name) {
return '';
} else {
return (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '')
. $name
. (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : '');
}
};
/** @skipUpgrade */ /** @skipUpgrade */
$databaseConfig = array( $databaseConfig = array(
"type" => defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase', "type" => defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase',
"server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : 'localhost', "server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : 'localhost',
"username" => SS_DATABASE_USERNAME, "username" => SS_DATABASE_USERNAME,
"password" => SS_DATABASE_PASSWORD, "password" => SS_DATABASE_PASSWORD,
"database" => (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '') "database" => $databaseNameWrapper($database),
. $database
. (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : ''),
); );
// Set the port if called for // Set the port if called for