From 954b5077e495aa9fa4eb54ef4cb8ac309e9415ae Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Fri, 9 Dec 2011 10:59:53 -0500 Subject: [PATCH] Fixed nesting recursion error in some situations. Complement to DDC-1276. --- lib/Doctrine/ORM/UnitOfWork.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 803e6683c32..eb3111fb8d1 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -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);