From 1b891324c96819de6e7988f90b9ba2afea7c6f29 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 29 May 2007 18:33:22 +0000
Subject: [PATCH]

---
 draft/new-core/Hydrate.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/draft/new-core/Hydrate.php b/draft/new-core/Hydrate.php
index cd4db67fc..6a3ed9a2c 100644
--- a/draft/new-core/Hydrate.php
+++ b/draft/new-core/Hydrate.php
@@ -834,9 +834,11 @@ class Doctrine_Hydrate implements Serializable
                 if ( ! isset($currData[$alias])) {
                     $currData[$alias] = array();
                 }
+
                 if ( ! isset($prev[$alias])) {
                     $prev[$alias] = array();
-                }        
+                }  
+
 
                 if ($alias !== $lastAlias || $parse) {
                     // component changed
@@ -849,6 +851,7 @@ class Doctrine_Hydrate implements Serializable
 
                                 $array[$index] = $driver->getElement($currData[$alias], $componentName);
                                 $prev[$alias]  =& $array[$index];
+
                                 $index++;
                             }
                         }
@@ -857,11 +860,16 @@ class Doctrine_Hydrate implements Serializable
                         $relation = $this->_aliasMap[$cache[$key]['alias']]['relation'];
 
                         if ( ! isset($prevData[$alias]) || $currData[$alias] !== $prevData[$alias]) {
-                            // check the type of the relation
-                            if ( ! $relation->isOneToOne()) {
-                                $prev[$parent][$component][] = $driver->getElement($currData[$alias], $componentName);
-                            } else {
-                                $prev[$parent][$component] = $driver->getElement($currData[$alias], $componentName);
+                            if ( ! empty($currData[$alias])) {
+                                // check the type of the relation
+                                if ( ! $relation->isOneToOne()) {  
+    
+                                    $prev[$parent][$component][] = $driver->getElement($currData[$alias], $componentName);
+    
+                                    $driver->registerCollection($prev[$parent][$component]);
+                                } else {
+                                    $prev[$parent][$component] = $driver->getElement($currData[$alias], $componentName);
+                                }
                             }
                         }
                     }
@@ -905,6 +913,7 @@ class Doctrine_Hydrate implements Serializable
                     // check the type of the relation
                     if ( ! $relation->isOneToOne()) {
                         $prev[$parent][$component][] = $driver->getElement($currData[$alias], $componentName);
+                        $driver->registerCollection($prev[$parent][$component]);
                     } else {
                         $prev[$parent][$component] = $driver->getElement($currData[$alias], $componentName);
                     }