Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

DDC-1594 - Fix merge error

  • Loading branch information...
commit affa6feb8aa207bf74406a4dd20adad6978f0f1e 1 parent 061ea2b
@beberlei beberlei authored
Showing with 0 additions and 5 deletions.
  1. +0 −5 lib/Doctrine/ORM/UnitOfWork.php
View
5 lib/Doctrine/ORM/UnitOfWork.php
@@ -1453,11 +1453,6 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass
} else {
throw new EntityNotFoundException;
}
-
- $managedCopy = $this->newInstance($class);
- $class->setIdentifierValues($managedCopy, $id);
-
- $this->persistNew($class, $managedCopy);
} else {
if ($managedCopy instanceof Proxy && ! $managedCopy->__isInitialized__) {
$managedCopy->__load();
Please sign in to comment.
Something went wrong with that request. Please try again.