Skip to content

Commit 139e45f

Browse files
rullzerBackportbot
authored andcommitted
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>
1 parent 2ab1c4d commit 139e45f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/private/legacy/app.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ public static function loadApp(string $app) {
158158
throw $ex;
159159
}
160160
\OC::$server->getLogger()->logException($ex);
161-
if (!\OC::$server->getAppManager()->isShipped($app)) {
162-
// Only disable apps which are not shipped
161+
162+
if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
163+
// Only disable apps which are not shipped and that are not authentication apps
163164
\OC::$server->getAppManager()->disableApp($app, true);
164165
}
165166
}

0 commit comments

Comments
 (0)