Adding test case, and removing unreachable code.

cakephp · Dec 9, 2009 · 17777af · 17777af
1 parent 4421fe6
commit 17777af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -1397,15 +1397,6 @@ function match($url) {
 			return false;
 		}
 
-		//check that required passed parameters are the same.
-		$i = 0;
-		while (isset($defaults[$i])) {
-			if (isset($url[$i]) && $defaults[$i] !== $url[$i]) {
-				return false;
-			}
-			$i++;
-		}
-
 		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames);
 		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
 

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -2299,6 +2299,9 @@ function testMatchWithNamedParametersAndPassedArgs() {
 
 		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 2, 'something'));
 		$this->assertEqual($result, '/test2/something');
+
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 5, 'something'));
+		$this->assertFalse($result);
 	}
 
 /**