[Pkg-owncloud-commits] [owncloud] 64/95: shipped and 3rd-party apps of type authentication and session will remain enabled during update

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.0.1
in repository owncloud.

commit 1188c74fe5dc20cbbdf5fa2c1c61c242669516aa
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Thu Feb 19 15:59:20 2015 +0100

    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(-)

diff --git a/lib/private/updater.php b/lib/private/updater.php
index f7ba4b9..7d252af 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -346,10 +346,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));
 		}
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git