Fixing issues in ContainableBehavior that could leave models unbound …

…when 'fields' was used as part of containment conditions. Fixes #253
cakephp · Nov 7, 2009 · 6db91b0 · 6db91b0
1 parent dd0c4a6
commit 6db91b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php
@@ -155,7 +155,7 @@ function beforeFind(&$Model, $query) {
 							if (!$reset && empty($instance->__backOriginalAssociation)) {
 								$instance->__backOriginalAssociation = $backupBindings;
 							} else if ($reset) {
-								$instance->__backAssociation[$type] = $instance->{$type};
+								$instance->__backAssociation[$type] = $backupBindings[$type];
 							}
 							$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
 						}

diff --git a/cake/tests/cases/libs/model/behaviors/containable.test.php b/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -3390,7 +3390,7 @@ function testResetDeeperHasOneAssociations() {
 			)
 		));
 		$this->assertEqual($expected, $this->Article->User->hasOne);
-		
+
 		$this->Article->User->bindModel($userHasOne, false);
 		$expected = $this->Article->User->hasOne;
 		$this->Article->find('all', array(