summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-11-05 14:03:12 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-11-05 14:03:12 +0100
commite624e9064c25c76bf6dbb479db5811a238c1f340 (patch)
tree5a591c1dd3bf6cdebfeade18d5c7a4c804a0b737
parent06267fec8fb57ba6921d4c704cb2c05eb1d4c36e (diff)
parent91a23bfa9c9b3d7dd5f564910ad99be2316c15e0 (diff)
downloadnextcloud-server-e624e9064c25c76bf6dbb479db5811a238c1f340.tar.gz
nextcloud-server-e624e9064c25c76bf6dbb479db5811a238c1f340.zip
Merge pull request #11965 from owncloud/fix-jsonresponse
fix typo in content type for JSONResponse
-rw-r--r--lib/public/appframework/http/jsonresponse.php2
-rw-r--r--tests/lib/appframework/http/JSONResponseTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index c6360e0a0f5..c9c8696323d 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -49,7 +49,7 @@ class JSONResponse extends Response {
public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
$this->data = $data;
$this->setStatus($statusCode);
- $this->addHeader('Content-type', 'application/json; charset=utf-8');
+ $this->addHeader('Content-Type', 'application/json; charset=utf-8');
}
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index f7c89a9d2e1..06cd3410a69 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -44,7 +44,7 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase {
public function testHeader() {
$headers = $this->json->getHeaders();
- $this->assertEquals('application/json; charset=utf-8', $headers['Content-type']);
+ $this->assertEquals('application/json; charset=utf-8', $headers['Content-Type']);
}