wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not disable authentication apps

Browse source 
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>
This commit is contained in:
Roeland Jago Douma 2019-12-10 09:01:35 +01:00 committed by Backportbot
parent 5623dff5ef
commit c0becec8ad
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/legacy/app.php
View file

@ -158,8 +158,9 @@ class OC_App {
throw $ex; throw $ex;
} }
\OC::$server->getLogger()->logException($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); \OC::$server->getAppManager()->disableApp($app, true);
} }
} }