Skip to content

Commit

Permalink
Fixed nesting recursion error in some situations. Complement to DDC-1…
Browse files Browse the repository at this point in the history
…276.
  • Loading branch information
guilhermeblanco committed Dec 9, 2011
1 parent 0febf06 commit 954b507
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/UnitOfWork.php
Expand Up @@ -1735,7 +1735,7 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass
$managedCol->initialize();

// clear and set dirty a managed collection if its not also the same collection to merge from.
if (!$managedCol->isEmpty() && $managedCol != $mergeCol) {
if (!$managedCol->isEmpty() && $managedCol !== $mergeCol) {
$managedCol->unwrap()->clear();
$managedCol->setDirty(true);

Expand Down

0 comments on commit 954b507

Please sign in to comment.