diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-19 15:59:20 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-02-24 12:02:37 +0100 |
| commit | fe7e7677e91a6c66f600f303ad3dc36a34c0d424 (patch) | |
| tree | 87ef709462578ab610ef4c1ffc82c556b9b84925 /lib/private/updater.php | |
| parent | bbf7f56f949f48ec0cf95d416b431d0cd739582f (diff) | |
| download | nextcloud-server-fe7e7677e91a6c66f600f303ad3dc36a34c0d424.tar.gz nextcloud-server-fe7e7677e91a6c66f600f303ad3dc36a34c0d424.zip | |
shipped and 3rd-party apps of type authentication and session will remain enabled during update
Diffstat (limited to 'lib/private/updater.php')
| -rw-r--r-- | lib/private/updater.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index 41ce779d7db..0853696fe24 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -367,10 +367,18 @@ class Updater extends BasicEmitter { OC_App::disable($app); $this->emit('\OC\Updater', 'incompatibleAppDisabled', array($app)); } - if (!OC_App::isShipped($app)) { - \OC_App::disable($app); - $this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($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); + $this->emit('\OC\Updater', 'thirdPartyAppDisabled', array($app)); } } } |