From 72466b364e0e0558931d08c4ccd3cd360fa7a6a5 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 14 Jun 2007 16:01:15 +0000
Subject: [PATCH]

---
 lib/Doctrine/Relation/Parser.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Relation/Parser.php b/lib/Doctrine/Relation/Parser.php
index 4bd730b23..134564c00 100644
--- a/lib/Doctrine/Relation/Parser.php
+++ b/lib/Doctrine/Relation/Parser.php
@@ -102,6 +102,8 @@ class Doctrine_Relation_Parser
         }
 
         $this->_pending[$alias] = array_merge($options, array('class' => $name, 'alias' => $alias));
+        
+        return $this->_pending[$alias];
     }
     /**
      * getRelation
@@ -124,8 +126,8 @@ class Doctrine_Relation_Parser
                 $localClasses = array_merge($this->_table->getOption('parents'), array($this->_table->getComponentName()));
 
                 if ( ! isset($this->_pending[$def['refClass']]) && 
-                     ! isset($this->_relations[$def['refClass']])) {
-                    
+                     ! isset($this->_relations[$def['refClass']])) {    
+
                     $def['refTable']->getRelationParser()->bind($this->_table->getComponentName(),
                                                                 array('type'    => Doctrine_Relation::ONE,
                                                                       'local'   => $def['local'],
@@ -133,8 +135,10 @@ class Doctrine_Relation_Parser
                                                                       'localKey' => true,
                                                                       ));
 
-                    $this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY, 
-                                                        'foreign' => $def['local']));
+                    $this->bind($def['refClass'], array('type' => Doctrine_Relation::MANY,
+                                                        'foreign' => $def['local'],
+                                                        'local'   => $this->_table->getIdentifier()));
+
                 }
                 if (in_array($def['class'], $localClasses)) {
                     $rel = new Doctrine_Relation_Nest($def);