summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-11-30 16:01:42 +0100
committerMorris Jobke <hey@morrisjobke.de>2017-11-30 16:04:07 +0100
commit0f35ef3727ee6ccec6f80cbc636b45aad00db903 (patch)
treefc43a4eea285b55badc8925ca75090db5d325761 /lib/base.php
parentf22e02cd79e27b1d994fd84a98eb5a8c60563e72 (diff)
downloadnextcloud-server-0f35ef3727ee6ccec6f80cbc636b45aad00db903.tar.gz
nextcloud-server-0f35ef3727ee6ccec6f80cbc636b45aad00db903.zip
Reuse systemconfig
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/base.php b/lib/base.php
index 89e3e65cea6..57e1b0c763f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -291,15 +291,14 @@ class OC {
/**
* Prints the upgrade page
+ *
+ * @param \OC\SystemConfig $systemConfig
*/
- private static function printUpgradePage() {
- $systemConfig = \OC::$server->getSystemConfig();
-
+ private static function printUpgradePage(\OC\SystemConfig $systemConfig) {
$disableWebUpdater = $systemConfig->getValue('upgrade.disable-web', false);
$tooBig = false;
if (!$disableWebUpdater) {
$apps = \OC::$server->getAppManager();
- $tooBig = false;
if ($apps->isInstalled('user_ldap')) {
$qb = \OC::$server->getDatabaseConnection()->getQueryBuilder();
@@ -903,7 +902,7 @@ class OC {
if (!$systemConfig->getValue('installed', false)) {
\OC::$server->getSession()->clear();
$setupHelper = new OC\Setup(
- \OC::$server->getSystemConfig(),
+ $systemConfig,
\OC::$server->getIniWrapper(),
\OC::$server->getL10N('lib'),
\OC::$server->query(\OCP\Defaults::class),
@@ -929,7 +928,7 @@ class OC {
opcache_reset();
}
if (!$systemConfig->getValue('maintenance', false)) {
- self::printUpgradePage();
+ self::printUpgradePage($systemConfig);
exit();
}
}