diff --git a/cake/libs/model/behaviors/containable.php b/cake/libs/model/behaviors/containable.php index aaab3547e..2c1daf72b 100644 --- a/cake/libs/model/behaviors/containable.php +++ b/cake/libs/model/behaviors/containable.php @@ -147,8 +147,6 @@ class ContainableBehavior extends ModelBehavior { if (!empty($unbind)) { if (!$reset && empty($instance->__backOriginalAssociation)) { $instance->__backOriginalAssociation = $backupBindings; - } else if ($reset && empty($instance->__backContainableAssociation)) { - $instance->__backContainableAssociation = $backupBindings; } $instance->unbindModel(array($type => $unbind), $reset); } @@ -219,24 +217,6 @@ class ContainableBehavior extends ModelBehavior { return $query; } -/** - * Resets original associations on models that may have receive multiple, - * subsequent unbindings. - * - * @param object $Model Model on which we are resetting - * @param array $results Results of the find operation - * @param bool $primary true if this is the primary model that issued the find operation, false otherwise - * @access public - */ - function afterFind(&$Model, $results, $primary) { - if (!empty($Model->__backContainableAssociation)) { - foreach ($Model->__backContainableAssociation as $relation => $bindings) { - $Model->{$relation} = $bindings; - unset($Model->__backContainableAssociation); - } - } - } - /** * Unbinds all relations from a model except the specified ones. Calling this function without * parameters unbinds all related models.