1 files changed, 12 insertions, 2 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 786e2e28ed2..2d6394fea85 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -70,6 +70,12 @@ class Upgrade extends Command {
 				null,
 				InputOption::VALUE_NONE,
 				'only runs the database schema migration simulation, do not actually update'
+			)
+			->addOption(
+				'--no-app-disable',
+				null,
+				InputOption::VALUE_NONE,
+				'skips the disable of third party apps'
 			);
 	}
 
@@ -83,6 +89,7 @@ class Upgrade extends Command {
 
 		$simulateStepEnabled = true;
 		$updateStepEnabled = true;
+		$skip3rdPartyAppsDisable = false;
 
 		if ($input->getOption('skip-migration-test')) {
 			$simulateStepEnabled = false;
@@ -90,6 +97,9 @@ class Upgrade extends Command {
 	   	if ($input->getOption('dry-run')) {
 			$updateStepEnabled = false;
 		}
+		if ($input->getOption('no-app-disable')) {
+			$skip3rdPartyAppsDisable = true;
+		}
 
 		if (!$simulateStepEnabled && !$updateStepEnabled) {
 			$output->writeln(
@@ -106,6 +116,7 @@ class Upgrade extends Command {
 
 			$updater->setSimulateStepEnabled($simulateStepEnabled);
 			$updater->setUpdateStepEnabled($updateStepEnabled);
+			$updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable);
 
 			$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
 				$output->writeln('<info>Turned on maintenance mode</info>');
@@ -132,7 +143,7 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
 				$output->writeln('<info>Disabled incompatible app: ' . $app . '</info>');
 			});
-			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use($output) {
+			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
 				$output->writeln('<info>Disabled 3rd-party app: ' . $app . '</info>');
 			});
 			$updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use($output) {
@@ -150,7 +161,6 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($output) {
 				$output->writeln("<info>Updated <$app> to $version</info>");
 			});
-
 			$updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) {
 				$output->writeln("<error>$message</error>");
 				$self->upgradeFailed = true;