From afc9495b3f2463ec00dd5b13a6a8376200e7c867 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 21 Feb 2011 18:52:49 +0100 Subject: [PATCH] Revert "Merge branch 'DDC-884'" This reverts commit 3eea19dcfa654f00398c6b2fe380bbae16af74aa, reversing changes made to b13c29944bab4d49eb8b59f89d7a520ac1bea778. --- lib/Doctrine/ORM/EntityManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index 305d5c8b3..cdd178baf 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -725,6 +725,6 @@ class EntityManager implements ObjectManager throw new \InvalidArgumentException("Invalid argument: " . $conn); } - return new self($conn, $config, $conn->getEventManager()); + return new EntityManager($conn, $config, $conn->getEventManager()); } }