Fix trailing / present when extensions were used.

cakephp · Jul 4, 2012 · e1db220 · e1db220
1 parent 1dac947
commit e1db220
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/Cake/Routing/Route/Route.php b/lib/Cake/Routing/Route/Route.php
@@ -495,11 +495,13 @@ protected function _writeUrl($params, $pass = array(), $query = array()) {
 				$out
 			);
 		}
+		if (!empty($params['_ext']) || !empty($query)) {
+			$out = rtrim($out, '/');
+		}
 		if (!empty($params['_ext'])) {
 			$out .= '.' . $params['_ext'];
 		}
 		if (!empty($query)) {
-			$out = rtrim($out, '/');
 			$out .= '?' . http_build_query($query);
 		}
 		return $out;

diff --git a/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/RouteTest.php
@@ -436,6 +436,22 @@ public function testMatchWithExtension() {
 			'_ext' => 'json'
 		));
 		$this->assertEquals('/posts/index.json', $result);
+
+		$route = new Route('/:controller/:action/*');
+		$result = $route->match(array(
+			'controller' => 'posts',
+			'action' => 'index',
+			'_ext' => 'json',
+		));
+		$this->assertEquals('/posts/index.json', $result);
+
+		$result = $route->match(array(
+			'controller' => 'posts',
+			'action' => 'view',
+			1,
+			'_ext' => 'json',
+		));
+		$this->assertEquals('/posts/view/1.json', $result);
 	}
 
 /**