summaryrefslogtreecommitdiffstats
path: root/lib/private
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 13:41:09 +0100
commitd639dfacb7c68fa9bad7f3289cbc182e8feb6e3d (patch)
tree2ee2745c681ba7ccaf41b58184cc5441e191d9bd /lib/private
parentc25da25180bd446c0068a0155a5a386ac05d2d51 (diff)
downloadnextcloud-server-d639dfacb7c68fa9bad7f3289cbc182e8feb6e3d.tar.gz
nextcloud-server-d639dfacb7c68fa9bad7f3289cbc182e8feb6e3d.zip
Keep all shipped apps enabled because they should be okay
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private')
-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 1b9fc28873e..53841a13acf 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);
}
}