fix config overrides in docker

This commit is contained in:
Paul Sweeney 2018-05-31 21:10:42 +01:00 committed by Frédéric Guillot
parent a97f80446e
commit e2d7e005e1
1 changed files with 2 additions and 2 deletions

View File

@ -15,13 +15,13 @@ if ($dbUrlParser->isEnvironmentVariableDefined()) {
define('DB_NAME', $dbSettings['database']);
}
$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'config.php'));
$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'data', 'config.php'));
if (file_exists($config_file)) {
require $config_file;
}
$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'data', 'config.php'));
$config_file = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'config.php'));
if (file_exists($config_file)) {
require $config_file;