tonyair
/
GridFieldBulkEditingTools
mirror of https://github.com/colymba/GridFieldBulkEditingTools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #87 from cjsewell/patch-1 

Set Content-Type to 'application/json' for wildcard HTTP_ACCEPT
This commit is contained in:
Thierry François 2014-09-05 09:31:06 +03:00
parent 013a4fde7b 4cc7da8b7e
commit 0cbbe2b1fc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bulkUpload/code/GridFieldBulkUpload_Request.php
View File

@ -295,7 +295,7 @@ class GridFieldBulkUpload_Request extends RequestHandler
*/
protected function contentTypeNegotiation(&$response)
{
if (isset($_SERVER['HTTP_ACCEPT']) && (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false))
if (isset($_SERVER['HTTP_ACCEPT']) && ((strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false) || $_SERVER['HTTP_ACCEPT'] === '*/*' )) {
{
$response->addHeader('Content-Type', 'application/json');
}else{