Merge pull request #21432 from nextcloud/fix/exception-getresult

Fix invalid usage of \Exception::getResult
nextcloud · Jun 16, 2020 · 4cff3a3 · 4cff3a3
2 parents 5e52c11 + 94a95ff
commit 4cff3a3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/ocs/v1.php b/ocs/v1.php
@@ -67,9 +67,15 @@
 	OC_API::setContentType();
 	http_response_code(405);
 	exit();
-} catch (Exception $ex) {
+} catch (\OC\OCS\Exception $ex) {
 	OC_API::respond($ex->getResult(), OC_API::requestedFormat());
 	exit();
+} catch (Throwable $ex) {
+	OC::$server->getLogger()->logException($ex);
+
+	OC_API::setContentType();
+	http_response_code(500);
+	exit();
 }
 
 /*