RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-06 15:29:26 +03:00
Code Issues Projects Releases Wiki Activity

DDC-832 - Small adjustments in the patch

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-10-31 11:11:15 +01:00
parent 4f71c3e6a3
commit 634aa0b291
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1439,12 +1439,11 @@ class UnitOfWork implements PropertyChangedListener
} }
if ($assoc2['isCascadeMerge']) { if ($assoc2['isCascadeMerge']) {
$managedCol->initialize(); $managedCol->initialize();
$managedCol->takeSnapshot();
if (!$managedCol->isEmpty()) { if (!$managedCol->isEmpty()) {
$managedCol->unwrap()->clear(); $managedCol->unwrap()->clear();
$managedCol->setDirty(true); $managedCol->setDirty(true);
if ($assoc2['isOwningSide'] && $assoc2['type'] == ClassMetadata::MANY_TO_MANY && $class->isChangeTrackingNotify()) { if ($assoc2['isOwningSide'] && $assoc2['type'] == ClassMetadata::MANY_TO_MANY && $class->isChangeTrackingNotify()) {
$this->scheduleForDirtyCheck($managedCol); $this->scheduleForDirtyCheck($managedCopy);
} }
} }
} }