Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'core/Container/ContainerFactory.php')
-rw-r--r--core/Container/ContainerFactory.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php
index 75735036aa..9c5eed1276 100644
--- a/core/Container/ContainerFactory.php
+++ b/core/Container/ContainerFactory.php
@@ -79,12 +79,7 @@ class ContainerFactory
// Development config
if ($this->isDevelopmentModeEnabled()) {
- $builder->addDefinitions(PIWIK_USER_PATH . '/config/environment/dev.php');
- }
-
- // User config
- if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
- $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
+ $this->addEnvironmentConfig($builder, 'dev');
}
// Environment config
@@ -92,6 +87,11 @@ class ContainerFactory
$this->addEnvironmentConfig($builder, $environment);
}
+ // User config
+ if (file_exists(PIWIK_USER_PATH . '/config/config.php')) {
+ $builder->addDefinitions(PIWIK_USER_PATH . '/config/config.php');
+ }
+
if (!empty($this->definitions)) {
foreach ($this->definitions as $definitionArray) {
$builder->addDefinitions($definitionArray);