mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21441 from nextcloud/backport/21432/stable19 

[stable19] Fix invalid usage of \Exception::getResult
This commit is contained in:
Roeland Jago Douma 2020-06-17 10:30:46 +02:00 committed by GitHub
parent 556bc6aed3 97f3e9d391
commit a436df0bc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocs/v1.php
View File

@ -67,9 +67,15 @@ try {
OC_API::setContentType(); OC_API::setContentType();
http_response_code(405); http_response_code(405);
exit(); exit();
} catch (Exception $ex) { } catch (\OC\OCS\Exception $ex) {
OC_API::respond($ex->getResult(), OC_API::requestedFormat()); OC_API::respond($ex->getResult(), OC_API::requestedFormat());
exit(); exit();
} catch (Throwable $ex) {
OC::$server->getLogger()->logException($ex);
OC_API::setContentType();
http_response_code(500);
exit();
} }
/* /*