$_GET should not be overwritten.

pull/25/head
Mike Cao 12 years ago
parent ecc0b87024
commit 98d57a82b4

@ -58,7 +58,7 @@ class Request {
'cookies' => new Collection($_COOKIE),
'files' => new Collection($_FILES),
'secure' => getenv('HTTPS') && getenv('HTTPS') != 'off',
'accept' => getenv('HTTP_ACCEPT'),
'accept' => getenv('HTTP_ACCEPT') ?: '',
'proxy_ip' => $this->getProxyIpAddress()
);
}
@ -84,7 +84,7 @@ class Request {
$this->url = '/';
}
else {
$_GET = self::parseQuery($this->url);
$_GET += self::parseQuery($this->url);
$this->query->setData($_GET);
}

Loading…
Cancel
Save