RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 20:36:14 +03:00
Code Issues Projects Releases Wiki Activity

DDC-2704 - data should be merged only into initialized proxies

Browse source
This commit is contained in:
Marco Pivetta 2015-01-20 15:48:58 +01:00
parent 91f4ed8b92
commit 8910c2c482
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1868,6 +1868,10 @@ class UnitOfWork implements PropertyChangedListener
$visited[$oid] = $managedCopy; // mark visited
if (!($entity instanceof Proxy && ! $entity->__isInitialized())) {
if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized()) {
$managedCopy->__load();
}
$this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
}