aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/server.php
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-12-18 11:24:15 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2015-12-18 11:53:41 +0100
commit0a09004d39b5d27124d59ed45debf109170b24d2 (patch)
treeb58a53749187396ed6ed5a962a15f06c66b071b8 /lib/private/server.php
parent82bf99c0cfd764b25d1442cf199f219cd852ff69 (diff)
downloadnextcloud-server-0a09004d39b5d27124d59ed45debf109170b24d2.tar.gz
nextcloud-server-0a09004d39b5d27124d59ed45debf109170b24d2.zip
Inject Config into SystemConfig
Diffstat (limited to 'lib/private/server.php')
-rw-r--r--lib/private/server.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index 8439500706d..3e1af0310d1 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -84,8 +84,9 @@ class Server extends SimpleContainer implements IServerContainer {
/**
* @param string $webRoot
+ * @param \OC\Config $config
*/
- public function __construct($webRoot) {
+ public function __construct($webRoot, \OC\Config $config) {
parent::__construct();
$this->webRoot = $webRoot;
@@ -238,8 +239,8 @@ class Server extends SimpleContainer implements IServerContainer {
$c->getSystemConfig()
);
});
- $this->registerService('SystemConfig', function ($c) {
- return new \OC\SystemConfig();
+ $this->registerService('SystemConfig', function ($c) use ($config) {
+ return new \OC\SystemConfig($config);
});
$this->registerService('AppConfig', function ($c) {
return new \OC\AppConfig(\OC_DB::getConnection());