diff options
| author | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-18 11:24:15 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2015-12-18 11:53:41 +0100 |
| commit | 0a09004d39b5d27124d59ed45debf109170b24d2 (patch) | |
| tree | b58a53749187396ed6ed5a962a15f06c66b071b8 /lib/base.php | |
| parent | 82bf99c0cfd764b25d1442cf199f219cd852ff69 (diff) | |
| download | nextcloud-server-0a09004d39b5d27124d59ed45debf109170b24d2.tar.gz nextcloud-server-0a09004d39b5d27124d59ed45debf109170b24d2.zip | |
Inject Config into SystemConfig
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 887499b58a5..aee1698e222 100644 --- a/lib/base.php +++ b/lib/base.php @@ -142,7 +142,7 @@ class OC { 'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'], ], ]; - $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig())); + $fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig(self::$config))); $scriptName = $fakeRequest->getScriptName(); if (substr($scriptName, -1) == '/') { $scriptName .= 'index.php'; @@ -522,7 +522,7 @@ class OC { } // setup the basic server - self::$server = new \OC\Server(\OC::$WEBROOT); + self::$server = new \OC\Server(\OC::$WEBROOT, self::$config); \OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd); \OC::$server->getEventLogger()->start('boot', 'Initialize'); |