From fe7e7677e91a6c66f600f303ad3dc36a34c0d424 Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 19 Feb 2015 15:59:20 +0100
Subject: shipped and 3rd-party apps of type authentication and session will
 remain enabled during update

---
 lib/private/updater.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib')

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));
 		}
 	}
 }
-- 
cgit v1.2.3