mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24398 from nextcloud/fix/do-not-update-incompatible-app 

Do not update incompatible apps
This commit is contained in:
Joas Schilling 2020-12-09 09:28:25 +01:00 committed by GitHub
parent 6f83546358 cbb34af53f
commit c8e0f3015f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Updater.php
View File

@ -360,7 +360,7 @@ class Updater extends BasicEmitter {
$disabledApps = []; $disabledApps = [];
$appManager = \OC::$server->getAppManager(); $appManager = \OC::$server->getAppManager();
foreach ($apps as $app) { 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); $info = OC_App::getAppInfo($app);
if ($info === null || !OC_App::isAppCompatible($version, $info)) { if ($info === null || !OC_App::isAppCompatible($version, $info)) {
if ($appManager->isShipped($app)) { if ($appManager->isShipped($app)) {

9
lib/private/legacy/OC_App.php
View File

@ -974,6 +974,15 @@ class OC_App {
\OC::$server->getAppManager()->clearAppsCache(); \OC::$server->getAppManager()->clearAppsCache();
$appData = self::getAppInfo($appId); $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::registerAutoloading($appId, $appPath, true);
self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']); self::executeRepairSteps($appId, $appData['repair-steps']['pre-migration']);