Browse Source

A better fix for issue #2711. Allows url to be unset from request array regardless of this->base context

Patrick Barabe 12 years ago
parent
commit
a69aeb67c1
1 changed files with 3 additions and 2 deletions
  1. 3 2
      lib/Cake/Network/CakeRequest.php

+ 3 - 2
lib/Cake/Network/CakeRequest.php

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