diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-19 16:29:50 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-19 16:29:50 -0600 |
| commit | 540656c716be3bbf0cab9fdb73f3c171cc3dd3c2 (patch) | |
| tree | 71bcb99c0d2b5fd16d97eadcc947e11488c23817 /lib/private/Server.php | |
| parent | c02527e41462133444881817b741f91ebf563b3b (diff) | |
| parent | edd55b0ea9c13273695bf95d913f4dfc03e08c95 (diff) | |
| download | nextcloud-server-540656c716be3bbf0cab9fdb73f3c171cc3dd3c2.tar.gz nextcloud-server-540656c716be3bbf0cab9fdb73f3c171cc3dd3c2.zip | |
Merge pull request #3907 from nextcloud/port-more-db-stuff
Use SystemConfig instead of AllConfig for DB stuff
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 4 |
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; |