aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-01-16 11:39:48 +0100
committerJoas Schilling <coding@schilljs.com>2018-01-16 11:39:48 +0100
commitc95890f9b0481680d992a0296173cb4185ad5593 (patch)
treee578cfb6466d52527079c736468153cf051f68e3
parenta02a7593cf07bee39542a263ddfa22283451ce44 (diff)
downloadnextcloud-server-c95890f9b0481680d992a0296173cb4185ad5593.tar.gz
nextcloud-server-c95890f9b0481680d992a0296173cb4185ad5593.zip
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/legacy/app.php4
1 files changed, 2 insertions, 2 deletions
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);
}
}