From cbfdf6197632d822167b25be82df0866088ccfa8 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei <kontakt@beberlei.de> Date: Sun, 2 Jan 2011 13:41:18 +0100 Subject: [PATCH] DDC-546 - Bugfix for PersistentCollection::count() in EXTRA LAZY special case. --- lib/Doctrine/ORM/PersistentCollection.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index fc2a00ba1..0732dd01c 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -471,9 +471,9 @@ final class PersistentCollection implements Collection if (!isset($this->doctrineCollectionCount)) { $this->doctrineCollectionCount = $this->em->getUnitOfWork() ->getCollectionPersister($this->association) - ->count($this) + $this->coll->count(); + ->count($this); } - return $this->doctrineCollectionCount; + return $this->doctrineCollectionCount + $this->coll->count(); } $this->initialize();