tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX text/json is not a valid mimetype

Browse Source
This commit is contained in:
Daniel Hensby 2018-08-15 12:10:39 +01:00
parent 3b06385b7d
commit d9154bffbf
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Control/PjaxResponseNegotiator.php
View File

@ -103,7 +103,7 @@ class PjaxResponseNegotiator
} }
} }
$response->setBody(Convert::raw2json($responseParts)); $response->setBody(Convert::raw2json($responseParts));
$response->addHeader('Content-Type', 'text/json'); $response->addHeader('Content-Type', 'application/json');
return $response; return $response;
} }

2
src/Forms/GridField/GridFieldAddExistingAutocompleter.php
View File

@ -263,7 +263,7 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF
} }
Config::unnest(); Config::unnest();
$response = new HTTPResponse(Convert::array2json($json)); $response = new HTTPResponse(Convert::array2json($json));
$response->addHeader('Content-Type', 'text/json'); $response->addHeader('Content-Type', 'application/json');
return $response; return $response;
} }

4
tests/php/Control/PjaxResponseNegotiatorTest.php
View File

@ -62,7 +62,7 @@ class PjaxResponseNegotiatorTest extends SapphireTest
$request = new HTTPRequest('GET', '/'); $request = new HTTPRequest('GET', '/');
$request->setSession(new Session([])); $request->setSession(new Session([]));
$request->addHeader('X-Pjax', 'myfragment,otherfragment'); $request->addHeader('X-Pjax', 'myfragment,otherfragment');
$request->addHeader('Accept', 'text/json'); $request->addHeader('Accept', 'application/json');
$response = $negotiator->respond($request); $response = $negotiator->respond($request);
$json = json_decode($response->getBody()); $json = json_decode($response->getBody());
$this->assertObjectHasAttribute('myfragment', $json); $this->assertObjectHasAttribute('myfragment', $json);
@ -87,7 +87,7 @@ class PjaxResponseNegotiatorTest extends SapphireTest
$request = new HTTPRequest('GET', '/'); $request = new HTTPRequest('GET', '/');
$request->setSession(new Session([])); $request->setSession(new Session([]));
$request->addHeader('X-Pjax', 'alpha'); $request->addHeader('X-Pjax', 'alpha');
$request->addHeader('Accept', 'text/json'); $request->addHeader('Accept', 'application/json');
$response = $negotiator->setFragmentOverride(array('beta'))->respond($request); $response = $negotiator->setFragmentOverride(array('beta'))->respond($request);
$json = json_decode($response->getBody()); $json = json_decode($response->getBody());