diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-02-29 11:47:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-29 11:47:50 +0100 |
| commit | 8df55ef5aa3ed2233132203e6316bb9fd855fef3 (patch) | |
| tree | d9263b94b9c4c8b594ec0e63063588e907dc8c99 /core/Command | |
| parent | 747c39195350023d78f2ae9a651fe57e6096f12f (diff) | |
| parent | 7b137ddd754f7dab5fcb8e0c34acb9b6d19b9a00 (diff) | |
| download | nextcloud-server-8df55ef5aa3ed2233132203e6316bb9fd855fef3.tar.gz nextcloud-server-8df55ef5aa3ed2233132203e6316bb9fd855fef3.zip | |
Merge pull request #29988 from nextcloud/enh/hide-overwrites-from-disabled-apps-list
Diffstat (limited to 'core/Command')
| -rw-r--r-- | core/Command/Upgrade.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php index c74b8d27049..45427f6552f 100644 --- a/core/Command/Upgrade.php +++ b/core/Command/Upgrade.php @@ -88,6 +88,7 @@ class Upgrade extends Command { $self = $this; $updater = \OCP\Server::get(Updater::class); + $incompatibleOverwrites = $this->config->getSystemValue('app_install_overwrite', []); /** @var IEventDispatcher $dispatcher */ $dispatcher = \OC::$server->get(IEventDispatcher::class); @@ -179,8 +180,10 @@ class Upgrade extends Command { $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($output) { $output->writeln('<info>Updated database</info>'); }); - $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output) { - $output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>'); + $updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output, &$incompatibleOverwrites) { + if (!in_array($app, $incompatibleOverwrites)) { + $output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>'); + } }); $updater->listen('\OC\Updater', 'upgradeAppStoreApp', function ($app) use ($output) { $output->writeln('<info>Update app ' . $app . ' from App Store</info>'); |