Skip to content
Snippets Groups Projects
Unverified Commit 94a95ffc authored by Christoph Wurst's avatar Christoph Wurst
Browse files

Fix invalid usage of \Exception::getResult


Only OCS exceptions have a getResult method. Any other exception will
cause another error due to this invalid method call.

This splits the catch into a specific one for OCS and then a generic one
for anything else that can't be handled.

Signed-off-by: default avatarChristoph Wurst <christoph@winzerhof-wurst.at>
parent 5e52c110
No related branches found
No related tags found
No related merge requests found
......@@ -67,9 +67,15 @@ try {
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();
}
/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment