RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-158] Small correction to previous patch. Moved takeSnapshot up in order not lose new objects that were added before initialization.

Browse Source
This commit is contained in:
romanb 2009-11-19 13:26:27 +00:00
parent 61f09e335e
commit ba496fd3ad
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,13 +235,13 @@ final class PersistentCollection implements \Doctrine\Common\Collections\Collect
}
$this->_coll->clear();
$this->_association->load($this->_owner, $this, $this->_em);
$this->takeSnapshot();
// Reattach NEW objects added through add(), if any.
if (isset($newObjects)) {
foreach ($newObjects as $obj) {
$this->_coll->add($obj);
}
}
$this->takeSnapshot();
$this->_initialized = true;
}
}
@ -435,6 +435,8 @@ final class PersistentCollection implements \Doctrine\Common\Collections\Collect
// SQL "SELECT 1" on the association (table) without initializing
// the collection.
// TODO: Change to use PK identity, not php object identity!?
$this->_initialize();
return $this->_coll->contains($element);
}