diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-27 18:11:33 -0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-27 18:11:33 -0300 |
| commit | aa10cca61b7912e639bbfcd659efa1d92ae18c6b (patch) | |
| tree | 315b792b649cbaccb0e0656482e5273082f5fd86 /core/Command/Upgrade.php | |
| parent | f000e22a97b9bae756cc5977badeffbc7a6852e9 (diff) | |
| download | nextcloud-server-aa10cca61b7912e639bbfcd659efa1d92ae18c6b.tar.gz nextcloud-server-aa10cca61b7912e639bbfcd659efa1d92ae18c6b.zip | |
Do not disable 3rdparty apps on occ upgrade
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'core/Command/Upgrade.php')
| -rw-r--r-- | core/Command/Upgrade.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index aec74849fea..2e518f52e21 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -87,12 +87,6 @@ class Upgrade extends Command { */ protected function execute(InputInterface $input, OutputInterface $output) { - $skip3rdPartyAppsDisable = false; - - if ($input->getOption('no-app-disable')) { - $skip3rdPartyAppsDisable = true; - } - if(\OC::checkUpgrade(false)) { if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { // Prepend each line with a little timestamp @@ -107,7 +101,9 @@ class Upgrade extends Command { $this->logger ); - $updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable); + if ($input->getOption('no-app-disable')) { + $updater->setSkip3rdPartyAppsDisable(true); + } $dispatcher = \OC::$server->getEventDispatcher(); $progress = new ProgressBar($output); $progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%"); |