diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-03-17 16:37:48 -0600 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-03-19 15:53:49 -0600 |
| commit | edd55b0ea9c13273695bf95d913f4dfc03e08c95 (patch) | |
| tree | 71bcb99c0d2b5fd16d97eadcc947e11488c23817 /lib/base.php | |
| parent | c02527e41462133444881817b741f91ebf563b3b (diff) | |
| download | nextcloud-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/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 04b6d82b1df..a6601a2dd67 100644 --- a/lib/base.php +++ b/lib/base.php @@ -658,7 +658,7 @@ class OC { self::performSameSiteCookieProtection(); if (!defined('OC_CONSOLE')) { - $errors = OC_Util::checkServer(\OC::$server->getConfig()); + $errors = OC_Util::checkServer(\OC::$server->getSystemConfig()); if (count($errors) > 0) { if (self::$CLI) { // Convert l10n string into regular string for usage in database @@ -911,7 +911,7 @@ class OC { // Check if Nextcloud is installed or in maintenance (update) mode if (!$systemConfig->getValue('installed', false)) { \OC::$server->getSession()->clear(); - $setupHelper = new OC\Setup(\OC::$server->getConfig(), \OC::$server->getIniWrapper(), + $setupHelper = new OC\Setup(\OC::$server->getSystemConfig(), \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), \OC::$server->getThemingDefaults(), \OC::$server->getLogger(), \OC::$server->getSecureRandom()); $controller = new OC\Core\Controller\SetupController($setupHelper); |