Merge branch 'master' into 2.5

This commit is contained in:
mark_story 2013-10-06 23:49:32 -03:00
commit 60b0893c79
15 changed files with 324 additions and 113 deletions

View file

@ -518,6 +518,9 @@ class RequestHandlerComponent extends Component {
}
list($contentType) = explode(';', env('CONTENT_TYPE'));
if ($contentType === '') {
list($contentType) = explode(';', CakeRequest::header('CONTENT_TYPE'));
}
if (!$type) {
return $this->mapType($contentType);
}