[EventListener] Fixed merging in MergeCollectionListener

fabienpomerol · Sep 20, 2011 · 73f746e · 73f746e
1 parent 52d360a
commit 73f746e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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);
                 }
             }