diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-07-21 19:52:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 19:52:17 +0200 |
| commit | 562e63cf69fd56aea51bf9e1e591f4eeb5c395c5 (patch) | |
| tree | 61441d402dce9caafa71f6b15ee2a1b270ec7f0f /lib/private | |
| parent | 8ec019e10594857a018d3f9298659a5757930fbf (diff) | |
| parent | e42f2f26504e3fcf975c15c3d3732646e819f37e (diff) | |
| download | nextcloud-server-562e63cf69fd56aea51bf9e1e591f4eeb5c395c5.tar.gz nextcloud-server-562e63cf69fd56aea51bf9e1e591f4eeb5c395c5.zip | |
Merge pull request #480 from nextcloud/fix_ocs_response_format
AppFramework default response for OCS is xml
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/AppFramework/Http/Dispatcher.php | 8 | ||||
| -rw-r--r-- | lib/private/AppFramework/Middleware/OCSMiddleware.php | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index fdf99a57841..965d340fc77 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -167,10 +167,14 @@ class Dispatcher { // if none is given try the first Accept header if($format === null) { $headers = $this->request->getHeader('Accept'); - $format = $controller->getResponderByHTTPHeader($headers); + $format = $controller->getResponderByHTTPHeader($headers, null); } - $response = $controller->buildResponse($response, $format); + if ($format !== null) { + $response = $controller->buildResponse($response, $format); + } else { + $response = $controller->buildResponse($response); + } } return $response; diff --git a/lib/private/AppFramework/Middleware/OCSMiddleware.php b/lib/private/AppFramework/Middleware/OCSMiddleware.php index 2c7d1167e7c..b21e8e05a90 100644 --- a/lib/private/AppFramework/Middleware/OCSMiddleware.php +++ b/lib/private/AppFramework/Middleware/OCSMiddleware.php @@ -72,7 +72,7 @@ class OCSMiddleware extends Middleware { // if none is given try the first Accept header if($format === null) { $headers = $this->request->getHeader('Accept'); - $format = $controller->getResponderByHTTPHeader($headers); + $format = $controller->getResponderByHTTPHeader($headers, 'xml'); } return $format; |