diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-04-28 08:33:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 08:33:28 +0200 |
| commit | a809aa51cd52d8fee93689452dd86d90ac4f9ad7 (patch) | |
| tree | 76033453c319db63fbae4a8d66ee70b84f3e4898 /core | |
| parent | 69088189999ec8c4ff0ce7f3a229afd8cca7b27d (diff) | |
| parent | aa10cca61b7912e639bbfcd659efa1d92ae18c6b (diff) | |
| download | nextcloud-server-a809aa51cd52d8fee93689452dd86d90ac4f9ad7.tar.gz nextcloud-server-a809aa51cd52d8fee93689452dd86d90ac4f9ad7.zip | |
Merge pull request #4570 from nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade
Do not disable 3rdparty apps on occ upgrade
Diffstat (limited to 'core')
| -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%%"); |