diff options
| -rw-r--r-- | lib/private/legacy/OC_App.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 2454d6be4f0..bfa894fa800 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -157,11 +157,17 @@ class OC_App { if ($ex instanceof ServerNotAvailableException) { throw $ex; } - \OC::$server->getLogger()->logException($ex); - if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) { + \OC::$server->getLogger()->logException($ex, [ + 'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(), + ]); + // Only disable apps which are not shipped and that are not authentication apps \OC::$server->getAppManager()->disableApp($app, true); + } else { + \OC::$server->getLogger()->logException($ex, [ + 'message' => "App $app threw an error during app.php load: " . $ex->getMessage(), + ]); } } \OC::$server->getEventLogger()->end('load_app_' . $app); |