Ported fix for #929 from 0.10 to trunk. Testcase needs to be ported later...

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

@@ -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; 

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
      */