Skip to content

Commit

Permalink
Do not disable authentication apps
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rullzer authored and Backportbot committed Dec 10, 2019
1 parent 5623dff commit c0becec
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions lib/private/legacy/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,9 @@ public static function loadApp(string $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);
}
}
Expand Down

0 comments on commit c0becec

Please sign in to comment.