From a072ba21bfbc72436fde9d0653ee52d5d2d9c7ff Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 24 Sep 2014 16:09:40 +0200 Subject: load actual config into application --- appinfo/application.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; }); /** -- cgit v1.2.3