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

also catch exceptions when loading apps
nextcloud · Aug 24, 2018 · 48f5cbe · 48f5cbe
2 parents 7bc9b9a + be9ab8b
commit 48f5cbe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
@@ -152,7 +152,7 @@ public static function loadApp(string $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