summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-12-10 19:29:05 +0100
committerGitHub <noreply@github.com>2019-12-10 19:29:05 +0100
commite5772bdc3df4aa435951d77b8678db2a11f5ab52 (patch)
tree0e58bdd20b41b7fa308167c641865a7804319945 /lib
parent028ddde9e5ddd186e2251b4c422702644c91a8c2 (diff)
parentc0becec8ad64d1883e7d09feb00d217d553ef6f8 (diff)
downloadnextcloud-server-e5772bdc3df4aa435951d77b8678db2a11f5ab52.tar.gz
nextcloud-server-e5772bdc3df4aa435951d77b8678db2a11f5ab52.zip
Merge pull request #18332 from nextcloud/backport/18312/stable17
[stable17] Do not disable authentication apps
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/app.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 0dcbadcd083..a2ffc483d39 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -158,8 +158,9 @@ class OC_App {
throw $ex;
}
\OC::$server->getLogger()->logException($ex);
- if (!\OC::$server->getAppManager()->isShipped($app)) {
- // Only disable apps which are not shipped
+
+ if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
+ // Only disable apps which are not shipped and that are not authentication apps
\OC::$server->getAppManager()->disableApp($app, true);
}
}