diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-24 16:09:40 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-24 16:09:40 +0200 |
commit | a072ba21bfbc72436fde9d0653ee52d5d2d9c7ff (patch) | |
tree | 6ce810d180fce23a7afc6e469a9615ccf25a12ff /appinfo | |
parent | c0648f28310d524d85c956e1e99bc84cea7d8d4c (diff) |
load actual config into application
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/application.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/appinfo/application.php b/appinfo/application.php index 2dea28fc2..09583fa1f 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -257,7 +257,7 @@ class Application extends App { $extensions[$extension] = phpversion($extension); } - return new AppConfig( + $config = new AppConfig( $c->query('ServerContainer')->getNavigationManager(), $c->query('L10N'), $c->query('ServerContainer')->getURLGenerator(), @@ -266,6 +266,10 @@ class Application extends App { $extensions, $c->query('DatabaseType') ); + + $config->loadConfig(__DIR__ . '/app.json'); + + return $config; }); /** |