From d4db1f5189b55157c9ea1c2e65dc38cbd270f3ef Mon Sep 17 00:00:00 2001 From: Colin Tucker Date: Thu, 12 Jan 2017 11:24:33 +1100 Subject: [PATCH] Check if $database is empty before adding prefix/suffix --- src/conf/ConfigureFromEnv.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/conf/ConfigureFromEnv.php b/src/conf/ConfigureFromEnv.php index 9504c4dd9..f360653c7 100644 --- a/src/conf/ConfigureFromEnv.php +++ b/src/conf/ConfigureFromEnv.php @@ -99,15 +99,25 @@ if (!isset($database) || !$database) { if (defined('SS_DATABASE_USERNAME') && defined('SS_DATABASE_PASSWORD')) { 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 */ $databaseConfig = array( "type" => defined('SS_DATABASE_CLASS') ? SS_DATABASE_CLASS : 'MySQLDatabase', "server" => defined('SS_DATABASE_SERVER') ? SS_DATABASE_SERVER : 'localhost', "username" => SS_DATABASE_USERNAME, "password" => SS_DATABASE_PASSWORD, - "database" => (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '') - . $database - . (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : ''), + "database" => $databaseNameWrapper($database), ); // Set the port if called for