Merge pull request #10841 from nextcloud/load-app-catch-exceptions

also catch exceptions when loading apps
This commit is contained in:
Morris Jobke 2018-08-24 19:29:47 +02:00 committed by GitHub
commit 48f5cbe439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -152,7 +152,7 @@ class OC_App {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
try {
self::requireAppFile($app);
} catch (Error $ex) {
} catch (Throwable $ex) {
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped