From e45ae7d08222f306fd5c7446a2fede35e835b25e Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 6 Sep 2007 20:52:16 +0000
Subject: [PATCH]

---
 lib/Doctrine/Hydrate.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php
index fe1e63af0..afad6a9dd 100644
--- a/lib/Doctrine/Hydrate.php
+++ b/lib/Doctrine/Hydrate.php
@@ -1024,6 +1024,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
                 }
             }
 
+
             // dealing with root component
             $table = $this->_aliasMap[$rootAlias]['table'];
             $componentName = $table->getComponentName();
@@ -1032,9 +1033,10 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
             $oneToOne = false;
 
             $index = $driver->search($element, $array);
-            if ($index === false) {      
-                if (isset($map['map'])) {
-                    $key = $map['map'];
+            if ($index === false) {  
+                if (isset($this->_aliasMap[$rootAlias]['map'])) {
+                    $key = $this->_aliasMap[$rootAlias]['map'];
+
                     if (isset($array[$key])) {
                         throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping.");
                     }
@@ -1042,6 +1044,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
                     if ( ! isset($element[$key])) {
                         throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key.");
                     }
+
                     $array[$element[$key]] = $element;
                 } else {
                     $array[] = $element;