Merge pull request #67 from acelaya-forks/feature/4.3.1

Feature/4.3.1
shlinkio · Mar 23, 2020 · 7e2e66d · 7e2e66d
2 parents 9596234 + c75129c
commit 7e2e66d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## 4.3.1 - 2020-03-23
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#66](https://github.com/shlinkio/shlink-installer/issues/66) Fixed regression making config not to be loaded from proper location.
+
+
 ## 4.3.0 - 2020-03-13
 
 #### Added

diff --git a/config/container.php b/config/container.php
@@ -37,9 +37,9 @@
 
 $config = (new ConfigAggregator([
     Config\ConfigProvider::class,
-    new PhpFileProvider('config/config.php'),       // Installer config
-    $shlinkConfigLoader,                            // Overwritten config coming from Shlink
-    new PhpFileProvider('config/config.local.php'), // Local config
+    new PhpFileProvider(__DIR__ . '/config.php'),       // Installer config
+    $shlinkConfigLoader,                                // Overwritten config coming from Shlink
+    new PhpFileProvider(__DIR__ . '/config.local.php'), // Local config
 ]))->getMergedConfig();
 
 $container = new ServiceManager($config['dependencies']);