Making PluginShortRoute check that the action exists before attemptin…

…g to proceed. Updated tests.
cakephp · Apr 3, 2010 · 9580217 · 9580217
1 parent a18d1be
commit 9580217
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cake/libs/router.php b/cake/libs/router.php
@@ -1631,6 +1631,9 @@ function parse($url) {
 		if (!App::import('Controller', $controllerName)) {
 			return false;
 		}
+		if (!method_exists($pluginName . 'Controller', $params['action'])) {
+			return false;
+		}
 		$params['controller'] = $params['plugin'];
 		return $params;
 	}

diff --git a/cake/tests/cases/libs/router.test.php b/cake/tests/cases/libs/router.test.php
@@ -2497,10 +2497,10 @@ function testParsing() {
 		$this->assertEqual($result['controller'], 'test_plugin');
 		$this->assertEqual($result['action'], 'add');
 
-		$result = $route->parse('/test_plugin/edit/1');
+		$result = $route->parse('/test_plugin/add/1');
 		$this->assertEqual($result['plugin'], 'test_plugin');
 		$this->assertEqual($result['controller'], 'test_plugin');
-		$this->assertEqual($result['action'], 'edit');
+		$this->assertEqual($result['action'], 'add');
 		$this->assertEqual($result['_args_'], '1', 'Passed args were wrong.');
 	}
 }