From 78492f3c9a84945d599fc35063c42a8ac0e84d61 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 5 Apr 2008 07:35:57 +0000
Subject: [PATCH] Ported fix for #929 from 0.10 to trunk. Testcase needs to be
 ported later since the behavior implementation is not useable in trunk atm.

---
 lib/Doctrine/Hydrator.php | 4 ++--
 lib/Doctrine/Record.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/Hydrator.php b/lib/Doctrine/Hydrator.php
index bf34b2578..15107ff5c 100644
--- a/lib/Doctrine/Hydrator.php
+++ b/lib/Doctrine/Hydrator.php
@@ -207,9 +207,9 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
                         } else {
                             $index = $identifierMap[$path][$id[$parent]][$id[$dqlAlias]];
                         }
+                        // register collection for later snapshots
+                        $driver->registerCollection($prev[$parent][$relationAlias]);
                     }
-                    // register collection for later snapshots
-                    $driver->registerCollection($prev[$parent][$relationAlias]);
                 } else {
                     // 1-1 relation
                     $oneToOne = true; 
diff --git a/lib/Doctrine/Record.php b/lib/Doctrine/Record.php
index 2f573831e..f8cedd195 100644
--- a/lib/Doctrine/Record.php
+++ b/lib/Doctrine/Record.php
@@ -87,7 +87,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
     private static $_index = 1;
     
     /**
-     * Boolean flag that indicated whether automatic accessor overriding is enabled.
+     * Boolean flag that indicates whether automatic accessor overriding is enabled.
      *
      * @var boolean
      */