From 1023af6a1ff34cb03535383bdcb37bd98343f30b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 4 Jul 2012 21:55:48 +0200 Subject: [PATCH] [DDC-1861] Fix UnitOfWork#doMerge() --- 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 b340d3c33..e4ce99879 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1655,7 +1655,7 @@ class UnitOfWork implements PropertyChangedListener $oid = spl_object_hash($entity); if (isset($visited[$oid])) { - return; // Prevent infinite recursion + return $visited[$oid]; // Prevent infinite recursion } $visited[$oid] = $entity; // mark visited