From c95890f9b0481680d992a0296173cb4185ad5593 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 16 Jan 2018 11:39:48 +0100 Subject: Keep all shipped apps enabled because they should be okay Signed-off-by: Joas Schilling --- lib/private/legacy/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 8114895416b..a20a88ac08f 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); } } -- cgit v1.2.3