RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Fix skipping properties if they are listed after a not loaded relation.

Browse Source
This commit is contained in:
Lenard Palko 2015-04-17 14:50:31 +03:00 committed by Marco Pivetta
parent f9bbd953a7
commit c68edec0c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -3378,7 +3378,7 @@ class UnitOfWork implements PropertyChangedListener
} else { } else {
if ($other instanceof Proxy && !$other->__isInitialized()) { if ($other instanceof Proxy && !$other->__isInitialized()) {
// do not merge fields marked lazy that have not been fetched. // do not merge fields marked lazy that have not been fetched.
return; continue;
} }
if ( ! $assoc2['isCascadeMerge']) { if ( ! $assoc2['isCascadeMerge']) {
@ -3406,7 +3406,7 @@ class UnitOfWork implements PropertyChangedListener
if ($mergeCol instanceof PersistentCollection && ! $mergeCol->isInitialized()) { if ($mergeCol instanceof PersistentCollection && ! $mergeCol->isInitialized()) {
// do not merge fields marked lazy that have not been fetched. // do not merge fields marked lazy that have not been fetched.
// keep the lazy persistent collection of the managed copy. // keep the lazy persistent collection of the managed copy.
return; continue;
} }
$managedCol = $prop->getValue($managedCopy); $managedCol = $prop->getValue($managedCopy);