Router::reverse now removes models and paging keys that controllers c…

…an insert into params arrays.
cakephp · Dec 28, 2009 · df8914b · df8914b
1 parent 5b78a66
commit df8914b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -994,7 +994,7 @@ function reverse($params) {
 		$pass = $params['pass'];
 		$named = $params['named'];
 		$url = $params['url'];
-		unset($params['pass'], $params['named'], $params['url'], $url['url']);
+		unset($params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url']);
 		$params = array_merge($params, $pass, $named);
 		if (!empty($url)) {
 			$params['?'] = $url;

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -1987,7 +1987,9 @@ function testRouterReverse() {
 			'action' => 'view',
 			'pass' => array(1),
 			'named' => array(),
-			'url' => array('url' => 'eng/posts/view/1', 'foo' => 'bar', 'baz' => 'quu')
+			'url' => array('url' => 'eng/posts/view/1', 'foo' => 'bar', 'baz' => 'quu'),
+			'paging' => array(),
+			'models' => array()
 		);
 		$result = Router::reverse($params);
 		$this->assertEqual($result, '/eng/posts/view/1?foo=bar&baz=quu');