diff options
| -rw-r--r-- | lib/private/Updater.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 705ee435d57..9c9da1f50c0 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -270,7 +270,9 @@ class Updater extends BasicEmitter { // upgrade appstore apps $this->upgradeAppStoreApps($appManager->getInstalledApps()); $autoDisabledApps = $appManager->getAutoDisabledApps(); - $this->upgradeAppStoreApps($autoDisabledApps, true); + if (!empty($autoDisabledApps)) { + $this->upgradeAppStoreApps(array_keys($autoDisabledApps), $autoDisabledApps); + } // install new shipped apps on upgrade $errors = Installer::installShippedApps(true); @@ -409,12 +411,12 @@ class Updater extends BasicEmitter { } /** - * @param array $disabledApps - * @param bool $reenable + * @param array $apps + * @param array $previousEnableStates * @throws \Exception */ - private function upgradeAppStoreApps(array $disabledApps, $reenable = false) { - foreach ($disabledApps as $app => $previousEnableSetting) { + private function upgradeAppStoreApps(array $apps, array $previousEnableStates = []) { + foreach ($apps as $app) { try { $this->emit('\OC\Updater', 'checkAppStoreAppBefore', [$app]); if ($this->installer->isUpdateAvailable($app)) { @@ -423,10 +425,10 @@ class Updater extends BasicEmitter { } $this->emit('\OC\Updater', 'checkAppStoreApp', [$app]); - if ($reenable) { + if (!empty($previousEnableStates)) { $ocApp = new \OC_App(); - if (!empty($previousEnableSetting)) { - $ocApp->enable($app, $previousEnableSetting); + if (!empty($previousEnableStates[$app])) { + $ocApp->enable($app, $previousEnableStates[$app]); } else { $ocApp->enable($app); } |