summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-17 16:37:48 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-03-19 15:53:49 -0600
commitedd55b0ea9c13273695bf95d913f4dfc03e08c95 (patch)
tree71bcb99c0d2b5fd16d97eadcc947e11488c23817 /lib/private/Server.php
parentc02527e41462133444881817b741f91ebf563b3b (diff)
downloadnextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.tar.gz
nextcloud-server-edd55b0ea9c13273695bf95d913f4dfc03e08c95.zip
Use SystemConfig instead of AllConfig for DB stuff
* preparation for followup PRs to clean up the DB bootstrapping Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 969b65f9553..24cd8b38684 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -479,12 +479,12 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerService('DatabaseConnection', function (Server $c) {
$systemConfig = $c->getSystemConfig();
- $factory = new \OC\DB\ConnectionFactory($c->getConfig());
+ $factory = new \OC\DB\ConnectionFactory($systemConfig);
$type = $systemConfig->getValue('dbtype', 'sqlite');
if (!$factory->isValidType($type)) {
throw new \OC\DatabaseException('Invalid database type');
}
- $connectionParams = $factory->createConnectionParams($systemConfig);
+ $connectionParams = $factory->createConnectionParams();
$connection = $factory->getConnection($type, $connectionParams);
$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
return $connection;