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

DDC-1193 - Fix previous commit.

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-06-05 10:02:57 +02:00
parent acaf08d4b7
commit bda4165bf8
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1678,10 +1678,6 @@ class UnitOfWork implements PropertyChangedListener
continue; continue;
} }
if ($entity instanceof Proxy && !$entity->__isInitialized__) {
$entity->__load();
}
$relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity); $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity);
if (($relatedEntities instanceof Collection || is_array($relatedEntities))) { if (($relatedEntities instanceof Collection || is_array($relatedEntities))) {
if ($relatedEntities instanceof PersistentCollection) { if ($relatedEntities instanceof PersistentCollection) {
@ -1711,7 +1707,7 @@ class UnitOfWork implements PropertyChangedListener
continue; continue;
} }
if ($entity instanceof Proxy) { if ($entity instanceof Proxy && !$entity->__isInitialized__) {
$entity->__load(); $entity->__load();
} }