Remove not needed 3rdparty app disabling during upgrade for PHP 5.x

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

2 files changed, 1 insertions, 20 deletions

diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 2a502dbe921..cadc1f8530c 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -76,13 +76,7 @@ class Upgrade extends Command {
 	protected function configure() {
 		$this
 			->setName('upgrade')
-			->setDescription('run upgrade routines after installation of a new release. The release has to be installed before.')
-			->addOption(
-				'--no-app-disable',
-				null,
-				InputOption::VALUE_NONE,
-				'skips the disable of third party apps'
-			);
+			->setDescription('run upgrade routines after installation of a new release. The release has to be installed before.');
 	}
 
 	/**
@@ -108,9 +102,6 @@ class Upgrade extends Command {
 					$this->installer
 			);
 
-			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%%");
@@ -224,9 +215,6 @@ class Upgrade extends Command {
 			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use($output) {
 				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
 			});
-			$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled 3rd-party app: ' . $app . '</comment>');
-			});
 			$updater->listen('\OC\Updater', 'checkAppStoreAppBefore', function ($app) use($output) {
 				$output->writeln('<info>Checking for update of app ' . $app . ' in appstore</info>');
 			});
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 2a29d1e536c..239b073dc9e 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -120,7 +120,6 @@ if (OC::checkUpgrade(false)) {
 			\OC::$server->query(\OC\Installer::class)
 	);
 	$incompatibleApps = [];
-	$disabledThirdPartyApps = [];
 
 	$dispatcher = \OC::$server->getEventDispatcher();
 	$dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($eventSource, $l) {
@@ -187,9 +186,6 @@ if (OC::checkUpgrade(false)) {
 	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
 		$incompatibleApps[]= $app;
 	});
-	$updater->listen('\OC\Updater', 'thirdPartyAppDisabled', function ($app) use (&$disabledThirdPartyApps) {
-		$disabledThirdPartyApps[]= $app;
-	});
 	$updater->listen('\OC\Updater', 'failure', function ($message) use ($eventSource, $config) {
 		$eventSource->send('failure', $message);
 		$eventSource->close();
@@ -217,9 +213,6 @@ if (OC::checkUpgrade(false)) {
 	}
 
 	$disabledApps = [];
-	foreach ($disabledThirdPartyApps as $app) {
-		$disabledApps[$app] = (string) $l->t('%s (3rdparty)', [$app]);
-	}
 	foreach ($incompatibleApps as $app) {
 		$disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]);
 	}