From 47bc0cc8a8422f329dbf971efd9b6f8c9f202414 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 10 Dec 2019 09:01:35 +0100
Subject: [PATCH] Do not disable authentication apps
For #18249
If an app encounters an error during loading of app.php the app is
normally disabled. However. We should make sure that this doesn't happen
for authentication apps (looking at your user_saml).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
lib/private/legacy/app.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 98700056111..b20fd8543c8 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);
}
}
--
GitLab