From a303a39d71c450578a238c5c015aa0a9f97243cf Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 22 Apr 2013 14:14:32 +0200 Subject: [PATCH] Allow SS_DATABASE_NAME in _ss_environment.php configuration Makes setups which are completely driven by that file a bit easier to automate, particularly if the same codebase is deployed multiple times (e.g. to a staging and live instance) --- conf/ConfigureFromEnv.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/ConfigureFromEnv.php b/conf/ConfigureFromEnv.php index ffa0beb99..b081ca694 100644 --- a/conf/ConfigureFromEnv.php +++ b/conf/ConfigureFromEnv.php @@ -73,8 +73,9 @@ global $database; // No database provided if(!isset($database) || !$database) { - // if SS_DATABASE_CHOOSE_NAME - if(defined('SS_DATABASE_CHOOSE_NAME') && SS_DATABASE_CHOOSE_NAME) { + if(defined('SS_DATABASE_NAME')) { + $database = SS_DATABASE_NAME; + } else if(defined('SS_DATABASE_CHOOSE_NAME') && SS_DATABASE_CHOOSE_NAME) { $loopCount = (int)SS_DATABASE_CHOOSE_NAME; $databaseDir = BASE_PATH; for($i=0;$i<$loopCount-1;$i++) $databaseDir = dirname($databaseDir);