diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 16:59:42 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-04 16:59:42 +0100 |
| commit | b6975143ff03c12e8f996b6f9f3144c5c0f47b25 (patch) | |
| tree | c19e955bf36bd3b0b016695cf14c2d191b19740f | |
| parent | f3213571bb2609a7f279fd5254f872083b3ea91a (diff) | |
| parent | d2e8358da22aa4d7ecfae4a062a82f554845f42a (diff) | |
| download | nextcloud-server-b6975143ff03c12e8f996b6f9f3144c5c0f47b25.tar.gz nextcloud-server-b6975143ff03c12e8f996b6f9f3144c5c0f47b25.zip | |
Merge pull request #12619 from owncloud/use-also-original-hea
Merge headers
| -rw-r--r-- | lib/public/appframework/controller.php | 2 | ||||
| -rw-r--r-- | tests/lib/appframework/controller/ControllerTest.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php index 398304e6feb..00981df05ba 100644 --- a/lib/public/appframework/controller.php +++ b/lib/public/appframework/controller.php @@ -70,7 +70,7 @@ abstract class Controller { $data->getData(), $data->getStatus() ); - $response->setHeaders($data->getHeaders()); + $response->setHeaders(array_merge($data->getHeaders(), $response->getHeaders())); return $response; } else { return new JSONResponse($data); diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php index d186651dc23..18d47d00f6b 100644 --- a/tests/lib/appframework/controller/ControllerTest.php +++ b/tests/lib/appframework/controller/ControllerTest.php @@ -173,7 +173,8 @@ class ControllerTest extends \Test\TestCase { public function testFormatDataResponseJSON() { $expectedHeaders = array( 'test' => 'something', - 'Cache-Control' => 'no-cache, must-revalidate' + 'Cache-Control' => 'no-cache, must-revalidate', + 'Content-Type' => 'application/json; charset=utf-8' ); $response = $this->controller->customDataResponse(array('hi')); |