diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-08-24 19:29:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 19:29:47 +0200 |
| commit | 48f5cbe439115352493bfe01a630c11f9202057f (patch) | |
| tree | bd24f6de35e6dc1f0e4c10528abbb97c6d7f09e0 /lib | |
| parent | 7bc9b9a76e006a98f8abf8bc95f18e1c95ddd321 (diff) | |
| parent | be9ab8b8792870e97946397cca7699ccafc76355 (diff) | |
| download | nextcloud-server-48f5cbe439115352493bfe01a630c11f9202057f.tar.gz nextcloud-server-48f5cbe439115352493bfe01a630c11f9202057f.zip | |
Merge pull request #10841 from nextcloud/load-app-catch-exceptions
also catch exceptions when loading apps
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index ab52a68caeb..9c7e6001e5e 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -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 |