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

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));
 		}
 	}
 }