Removing model id assignment form passedArgs, as it causes unexpected…

… results. Closes #536
cakephp · Apr 27, 2011 · 3433d12 · 3433d12
1 parent c4c35f2
commit 3433d12
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php
@@ -495,15 +495,9 @@ public function constructClasses() {
 		$this->Components->init($this);
 
 		if ($this->uses !== null || ($this->uses !== array())) {
-			if (empty($this->passedArgs) || !isset($this->passedArgs['0'])) {
-				$id = false;
-			} else {
-				$id = $this->passedArgs['0'];
-			}
 			$plugin = $this->plugin ? $this->plugin . '.' : null;
-
 			if ($this->uses === false) {
-				$this->loadModel($plugin . $this->modelClass, $id);
+				$this->loadModel($plugin . $this->modelClass);
 			} elseif ($this->uses) {
 				$uses = is_array($this->uses) ? $this->uses : array($this->uses);
 				list($plugin, $modelClassName) = pluginSplit($uses[0]);

diff --git a/lib/Cake/tests/Case/Controller/ControllerTest.php b/lib/Cake/tests/Case/Controller/ControllerTest.php
@@ -470,16 +470,8 @@ function testConstructClasses() {
 		$request = new CakeRequest('controller_posts/index');
 		$Controller = new Controller($request);
 
-		$Controller->modelClass = 'ControllerPost';
-		$Controller->passedArgs[] = '1';
-		$Controller->constructClasses();
-		$this->assertEqual($Controller->ControllerPost->id, 1);
-
-		unset($Controller);
-
 		$Controller = new Controller($request);
 		$Controller->uses = array('ControllerPost', 'ControllerComment');
-		$Controller->passedArgs[] = '1';
 		$Controller->constructClasses();
 		$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
 		$this->assertTrue(is_a($Controller->ControllerComment, 'ControllerComment'));