adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-02 17:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing issues in ContainableBehavior that could leave models unbound when 'fields' was used as part of containment conditions. Fixes #253

Browse source
This commit is contained in:
mark_story 2009-11-07 17:43:18 -05:00
parent dd0c4a64c5
commit 6db91b0f49
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/model/behaviors/containable.php
View file

@ -155,7 +155,7 @@ class ContainableBehavior extends ModelBehavior {
if (!$reset && empty($instance->__backOriginalAssociation)) { if (!$reset && empty($instance->__backOriginalAssociation)) {
$instance->__backOriginalAssociation = $backupBindings; $instance->__backOriginalAssociation = $backupBindings;
} else if ($reset) { } else if ($reset) {
$instance->__backAssociation[$type] = $instance->{$type}; $instance->__backAssociation[$type] = $backupBindings[$type];
} }
$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]); $instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
} }