From 977f0a5b5c7f721d9ce9d3d4518c0d240907a8fb 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 0c036a86c..aa4f00021 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -3393,7 +3393,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']) { @@ -3421,7 +3421,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);