Skip to content

Commit

Permalink
Preventing options leaking in loop
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzo committed Dec 4, 2013
1 parent 00ebd58 commit 559a834
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Cake/ORM/Table.php
Expand Up @@ -1149,16 +1149,17 @@ protected function _saveAssociations($assocs, $entity, array $options) {
foreach ($assocs as $alias) {
$association = $this->association($alias);
$property = $association->property();
$passOptions = $options;

if (!$entity->dirty($property)) {
continue;
}

if (isset($associated[$alias])) {
$options = (array)$associated[$alias] + $options;
$passOptions = (array)$associated[$alias] + $options;
}

if (!$association->save($entity, $options)) {
if (!$association->save($entity, $passOptions)) {
return false;
}
}
Expand Down

0 comments on commit 559a834

Please sign in to comment.