diff options
| author | Joas Schilling <coding@schilljs.com> | 2019-07-23 10:28:47 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-08-15 11:12:45 +0200 |
| commit | 810ee7d811c4cf0291add770cb89e5b6d11104b9 (patch) | |
| tree | 329b6656be47cfeca48239722b55df0a8a1e4bc4 /lib/private/Updater.php | |
| parent | f6c34240395bd53e160bdc8bac10e504451553b8 (diff) | |
| download | nextcloud-server-810ee7d811c4cf0291add770cb89e5b6d11104b9.tar.gz nextcloud-server-810ee7d811c4cf0291add770cb89e5b6d11104b9.zip | |
Make the auto-disabled list more broad
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Updater.php')
| -rw-r--r-- | lib/private/Updater.php | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 87e68b84cf4..d5de1bf6b27 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -75,13 +75,6 @@ class Updater extends BasicEmitter { ]; /** - * List of appIds that have automatically been disabled during upgrade - * - * @var String[] - */ - private $autoDisabledApps = []; - - /** * @param IConfig $config * @param Checker $checker * @param ILogger $log @@ -263,7 +256,7 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps()); - $autoDisabledApps = array_merge(\OC_App::$autoDisabledApps, $this->autoDisabledApps); + $autoDisabledApps = \OC::$server->getAppManager()->getAutoDisabledApps(); $this->upgradeAppStoreApps($autoDisabledApps, true); // install new shipped apps on upgrade @@ -412,8 +405,7 @@ class Updater extends BasicEmitter { if ($appManager->isShipped($app)) { throw new \UnexpectedValueException('The files of the app "' . $app . '" were not correctly replaced before running the update'); } - \OC::$server->getAppManager()->disableApp($app); - $this->autoDisabledApps[] = $app; + \OC::$server->getAppManager()->disableApp($app, true); $this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app)); } // no need to disable any app in case this is a non-core upgrade |