Merge pull request #2721 from nextcloud/ocs-die-on-exception

[downstream] Die in OCS v1.php on exception
This commit is contained in:
Roeland Jago Douma 2016-12-19 08:38:02 +01:00 committed by GitHub
commit 4f79d2ff0d
1 changed files with 3 additions and 1 deletions

View File

@ -65,8 +65,10 @@ try {
} catch (MethodNotAllowedException $e) {
OC_API::setContentType();
OC_Response::setStatus(405);
} catch (\OC\OCS\Exception $ex) {
exit();
} catch (Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat());
exit();
}
/*