Fixing Router::reverse() not correctly working with Request objects that

contained query string parameters.
zoghal · Jan 21, 2011 · 1c3e1df · 1c3e1df
1 parent e64e299
commit 1c3e1df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -1084,11 +1084,14 @@ public static function queryString($q, $extra = array(), $escape = false) {
  */
 	public static function reverse($params) {
 		if ($params instanceof CakeRequest) {
+			$url = $params->query;
 			$params = $params->params;
+		} else {
+			$url = $params['url'];
 		}
 		$pass = $params['pass'];
 		$named = $params['named'];
-		$url = $params['url'];
+
 		unset(
 			$params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url'],
 			$params['autoRender'], $params['bare'], $params['requested'], $params['return']

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -2309,9 +2309,11 @@ function testRouterReverse() {
 			'action' => 'view',
 			'pass' => array(1),
 			'named' => array(),
-			'url' => array('url' => 'eng/posts/view/1')
 		));
+		$request->query = array('url' => 'eng/posts/view/1', 'test' => 'value');
 		$result = Router::reverse($request);
+		$expected = '/eng/posts/view/1?test=value';
+		$this->assertEquals($expected, $result);
 	}
 
 /**