diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2019-07-22 21:28:03 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-08-15 11:12:43 +0200 |
| commit | f6c34240395bd53e160bdc8bac10e504451553b8 (patch) | |
| tree | 6f88dc78767257c2da79cdc66265067633fbed56 /lib/private/Updater.php | |
| parent | d14aed104850e4a8d3f415ce281d31894c570b36 (diff) | |
| download | nextcloud-server-f6c34240395bd53e160bdc8bac10e504451553b8.tar.gz nextcloud-server-f6c34240395bd53e160bdc8bac10e504451553b8.zip | |
Fix tracking of auto disabled apps in Updater
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'lib/private/Updater.php')
| -rw-r--r-- | lib/private/Updater.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 56bea90ddd7..87e68b84cf4 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -75,6 +75,13 @@ 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 @@ -256,7 +263,8 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps(\OC::$server->getAppManager()->getInstalledApps()); - $this->upgradeAppStoreApps(\OC_App::$autoDisabledApps, true); + $autoDisabledApps = array_merge(\OC_App::$autoDisabledApps, $this->autoDisabledApps); + $this->upgradeAppStoreApps($autoDisabledApps, true); // install new shipped apps on upgrade OC_App::loadApps(['authentication']); @@ -405,6 +413,7 @@ class Updater extends BasicEmitter { 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; $this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app)); } // no need to disable any app in case this is a non-core upgrade |