diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-12-09 09:28:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 09:28:25 +0100 |
| commit | c8e0f3015f9c9d2f5c0b10ab7c13dd8e89cc87ff (patch) | |
| tree | 5e900fffbb1908d707ad1e5a47e590440c4832d3 | |
| parent | 6f835463589935a8a00bb8b9b6b19f0b9f6b59af (diff) | |
| parent | cbb34af53f0e6a85375ef9223a9dd74b9ba646ce (diff) | |
| download | nextcloud-server-c8e0f3015f9c9d2f5c0b10ab7c13dd8e89cc87ff.tar.gz nextcloud-server-c8e0f3015f9c9d2f5c0b10ab7c13dd8e89cc87ff.zip | |
Merge pull request #24398 from nextcloud/fix/do-not-update-incompatible-app
Do not update incompatible apps
| -rw-r--r-- | lib/private/Updater.php | 2 | ||||
| -rw-r--r-- | lib/private/legacy/OC_App.php | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/Updater.php b/lib/private/Updater.php index 437ba38362c..b9b72dd7fa4 100644 --- a/lib/private/Updater.php +++ b/lib/private/Updater.php @@ -360,7 +360,7 @@ class Updater extends BasicEmitter { $disabledApps = []; $appManager = \OC::$server->getAppManager(); foreach ($apps as $app) { - // check if the app is compatible with this version of ownCloud + // check if the app is compatible with this version of Nextcloud $info = OC_App::getAppInfo($app); if ($info === null || !OC_App::isAppCompatible($version, $info)) { if ($appManager->isShipped($app)) { diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 0b9ae8c8c53..fdbbb1be907 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -974,6 +974,15 @@ class OC_App { \OC::$server->getAppManager()->clearAppsCache(); $appData = self::getAppInfo($appId); + $ignoreMaxApps = \OC::$server->getConfig()->getSystemValue('app_install_overwrite', []); + $ignoreMax = in_array($appId, $ignoreMaxApps, true); + \OC_App::checkAppDependencies( + \OC::$server->getConfig(), + \OC::$server->getL10N('core'), + $appData, + $ignoreMax + ); + self::registerAutoloading($appId, $appPath, true); self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); |