From c68edec0c243c9459e80b959748f68753b2b9da5 Mon Sep 17 00:00:00 2001 From: Lenard Palko Date: Fri, 17 Apr 2015 14:50:31 +0300 Subject: [PATCH] Fix skipping properties if they are listed after a not loaded relation. --- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index fe12e55df..194e45e30 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -3378,7 +3378,7 @@ class UnitOfWork implements PropertyChangedListener } else { if ($other instanceof Proxy && !$other->__isInitialized()) { // do not merge fields marked lazy that have not been fetched. - return; + continue; } if ( ! $assoc2['isCascadeMerge']) { @@ -3406,7 +3406,7 @@ class UnitOfWork implements PropertyChangedListener if ($mergeCol instanceof PersistentCollection && ! $mergeCol->isInitialized()) { // do not merge fields marked lazy that have not been fetched. // keep the lazy persistent collection of the managed copy. - return; + continue; } $managedCol = $prop->getValue($managedCopy);