shipped and 3rd-party apps of type authentication and session will remain enabled during update

This commit is contained in:
Thomas Müller 2015-02-19 15:59:20 +01:00
parent bbf7f56f94
commit fe7e7677e9
1 changed files with 11 additions and 3 deletions

View File

@ -367,11 +367,19 @@ class Updater extends BasicEmitter {
OC_App::disable($app); OC_App::disable($app);
$this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app)); $this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app));
} }
if (!OC_App::isShipped($app)) { // shipped apps will remain enabled
if (OC_App::isShipped($app)) {
continue;
}
// authentication and session apps will remain enabled as well
if (OC_App::isType($app, ['session', 'authentication'])) {
continue;
}
// disable any other 3rd party apps
\OC_App::disable($app); \OC_App::disable($app);
$this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app)); $this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app));
} }
} }
} }
}