diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpFoundation] moved the PUT magic dance in createFromGlobals()

Browse Source
This commit is contained in:
Fabien Potencier 2011-05-11 10:30:57 +02:00
parent efd1f1358c
commit 08846af9e2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -108,13 +108,6 @@ class Request
$this->server = new ServerBag($server); $this->server = new ServerBag($server);
$this->headers = new HeaderBag($this->server->getHeaders()); $this->headers = new HeaderBag($this->server->getHeaders());
if ('application/x-www-form-urlencoded' == $this->server->get('CONTENT_TYPE')
&& in_array(strtoupper($this->server->get('REQUEST_METHOD', 'GET'), array('PUT', 'DELETE'))
) {
parse_str($this->getContent(), $data);
$this->request = new ParameterBag($data);
}
$this->content = $content; $this->content = $content;
$this->languages = null; $this->languages = null;
$this->charsets = null; $this->charsets = null;
@ -134,7 +127,16 @@ class Request
*/ */
static public function createFromGlobals() static public function createFromGlobals()
{ {
return new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER); $request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
if ('application/x-www-form-urlencoded' == $request->server->get('CONTENT_TYPE')
&& in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET'), array('PUT', 'DELETE'))
) {
parse_str($this->getContent(), $data);
$request->request = new ParameterBag($data);
}
return $request;
} }
/** /**