mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reuse systemconfig 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-11-30 16:01:42 +01:00
parent f22e02cd79
commit 0f35ef3727
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base.php
View File

@ -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();
}
}