Merge branch '2.0' into 2.1

This commit is contained in:
mark_story 2012-02-18 11:22:18 -05:00
commit 20229eeb43
4 changed files with 44 additions and 2 deletions

View file

@ -185,7 +185,7 @@ class CakeRequest implements ArrayAccess {
$query = $_GET;
}
unset($query['/' . str_replace('.', '_', $this->url)]);
unset($query['/' . str_replace('.', '_', urldecode($this->url))]);
if (strpos($this->url, '?') !== false) {
list(, $querystr) = explode('?', $this->url);
parse_str($querystr, $queryArgs);