From 73f746e6a0bd01888df9a0ab185cc8f04edb4b23 Mon Sep 17 00:00:00 2001 From: "pierreyves.lebecq" Date: Tue, 20 Sep 2011 12:18:05 +0200 Subject: [PATCH] [EventListener] Fixed merging in MergeCollectionListener --- Form/EventListener/MergeCollectionListener.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Form/EventListener/MergeCollectionListener.php b/Form/EventListener/MergeCollectionListener.php index 22ca401c..be675e8d 100644 --- a/Form/EventListener/MergeCollectionListener.php +++ b/Form/EventListener/MergeCollectionListener.php @@ -32,11 +32,11 @@ public function onBindNormData(FilterDataEvent $event) $collection->clear(); } else { // merge $data into $collection - foreach ($collection as $model) { - if ($data->search($model) === false) { - $collection->remove($model); + foreach ($collection as $i => $model) { + if (false === $key = $data->search($model)) { + $collection->remove($i); } else { - $data->remove($model); + $data->remove($key); } }