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

#6174 #5570 CS - spacing

Browse Source
This commit is contained in:
Marco Pivetta 2016-12-18 14:39:46 +01:00
parent 576a4d7e31
commit d9821d3fda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1865,7 +1865,7 @@ class UnitOfWork implements PropertyChangedListener
$this->mergeEntityStateIntoManagedCopy($entity, $managedCopy); $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
$this->persistNew($class, $managedCopy); $this->persistNew($class, $managedCopy);
}else{ } else {
$this->ensureVersionMatch($class, $entity, $managedCopy); $this->ensureVersionMatch($class, $entity, $managedCopy);
$this->mergeEntityStateIntoManagedCopy($entity, $managedCopy); $this->mergeEntityStateIntoManagedCopy($entity, $managedCopy);
} }