diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2019-12-10 09:01:35 +0100 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2019-12-10 12:02:16 +0100 |
| commit | 47bc0cc8a8422f329dbf971efd9b6f8c9f202414 (patch) | |
| tree | 5060e9976434d41ddd502180b8229806f6a2c907 | |
| parent | 162b47075a986d943dcf2cbe59799112a7ee6c9a (diff) | |
| download | nextcloud-server-47bc0cc8a8422f329dbf971efd9b6f8c9f202414.tar.gz nextcloud-server-47bc0cc8a8422f329dbf971efd9b6f8c9f202414.zip | |
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>
| -rw-r--r-- | lib/private/legacy/app.php | 5 |
1 files 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); } } |