From be9ab8b8792870e97946397cca7699ccafc76355 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 24 Aug 2018 17:16:54 +0200
Subject: [PATCH] also catch exceptions when loading apps

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 lib/private/legacy/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
GitLab