summaryrefslogtreecommitdiffstats
path: root/ocs
diff options
context:
space:
mode:
authorSandro Lutz <sandro.lutz@temparus.ch>2017-02-07 00:12:45 +0100
committerSandro Lutz <sandro.lutz@temparus.ch>2017-02-07 00:15:30 +0100
commitfa1d607bfa951711a2c358f889db56962c179153 (patch)
tree904b6bd3b7f9d2ed133f64da22b3fb9bbfbf1842 /ocs
parentff3fa538e43bb38a5ff142b07216b9de79645c01 (diff)
parentb55f5af7eaab6f827989407fa7b8d51cbb877eab (diff)
downloadnextcloud-server-fa1d607bfa951711a2c358f889db56962c179153.tar.gz
nextcloud-server-fa1d607bfa951711a2c358f889db56962c179153.zip
Merge remote-tracking branch 'nextcloud/master'
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
Diffstat (limited to 'ocs')
-rw-r--r--ocs/v1.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/ocs/v1.php b/ocs/v1.php
index 5aec27ad981..79e74f20cdf 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -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();
}
/*