summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2018-08-24 17:16:54 +0200
committerRobin Appelman <robin@icewind.nl>2018-08-24 17:16:54 +0200
commitbe9ab8b8792870e97946397cca7699ccafc76355 (patch)
treeca701a24abdd9b99398a9790093ba4d3bd1d8fbb /lib/private
parenta0b84bc0fc10293275c9f97b76c111294f40f595 (diff)
downloadnextcloud-server-be9ab8b8792870e97946397cca7699ccafc76355.tar.gz
nextcloud-server-be9ab8b8792870e97946397cca7699ccafc76355.zip
also catch exceptions when loading apps
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/legacy/app.php2
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