summaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-04 09:35:01 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-08 22:33:36 +0100
commit2d5fc9c1a6beec15f04277ccf1408b17f04631e9 (patch)
treead3512ede81e47580f88cd2f1ebac71d28a59a3d /lib/private/server.php
parentaf91ee97c981d32bcd531e71d31e16f1232c44ce (diff)
downloadnextcloud-server-2d5fc9c1a6beec15f04277ccf1408b17f04631e9.tar.gz
nextcloud-server-2d5fc9c1a6beec15f04277ccf1408b17f04631e9.zip
Workaround to fix the too early init dilemma
* this needs to be properly fixed by a proper organisation of the base.php * introduced fixDIInit() in AllConfig that moves the injection of DatabaseConnection to a later point in time * problems mostly because of the autoconfig setup
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 28406d87319..5a1e955bdd2 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -168,8 +168,7 @@ class Server extends SimpleContainer implements IServerContainer {
});
$this->registerService('AllConfig', function (Server $c) {
return new \OC\AllConfig(
- $c->getSystemConfig(),
- $c->getDatabaseConnection()
+ $c->getSystemConfig()
);
});
$this->registerService('SystemConfig', function ($c) {