From d639dfacb7c68fa9bad7f3289cbc182e8feb6e3d Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 16 Jan 2018 11:39:48 +0100
Subject: [PATCH] Keep all shipped apps enabled because they should be okay

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/legacy/app.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 1b9fc28873..53841a13ac 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -236,8 +236,8 @@ class OC_App {
 			require_once $app . '/appinfo/app.php';
 		} catch (Error $ex) {
 			\OC::$server->getLogger()->logException($ex);
-			$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
-			if (!in_array($app, $blacklist)) {
+			if (!\OC::$server->getAppManager()->isShipped($app)) {
+				// Only disable apps which are not shipped
 				self::disable($app);
 			}
 		}