Merge pull request #528 from vantienvnn/2.0

CakeRequest::here explicitly using & as a query string separator to overcome issue in some badly configured 5.3 servers
This commit is contained in:
José Lorenzo Rodríguez 2012-02-24 06:51:12 -08:00
commit 2840dc74d3

View file

@ -547,7 +547,7 @@ class CakeRequest implements ArrayAccess {
public function here($base = true) { public function here($base = true) {
$url = $this->here; $url = $this->here;
if (!empty($this->query)) { if (!empty($this->query)) {
$url .= '?' . http_build_query($this->query); $url .= '?' . http_build_query($this->query, null, '&');
} }
if (!$base) { if (!$base) {
$url = preg_replace('/^' . preg_quote($this->base, '/') . '/', '', $url, 1); $url = preg_replace('/^' . preg_quote($this->base, '/') . '/', '', $url, 1);