Merge branch 'DDC-1192' into 2.0.x

Seldaek · Jun 5, 2011 · d4302b3 · d4302b3
2 parents c12c6e8 + 3c95b0e
commit d4302b3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -325,9 +325,6 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
                     $joinColumns[] = $this->_getJoinColumnMapping($manyToOneElement->{'join-column'});
                 } else if (isset($manyToOneElement->{'join-columns'})) {
                     foreach ($manyToOneElement->{'join-columns'}->{'join-column'} as $joinColumnElement) {
-                        if (!isset($joinColumnElement['name'])) {
-                            $joinColumnElement['name'] = $name;
-                        }
                         $joinColumns[] = $this->_getJoinColumnMapping($joinColumnElement);
                     }
                 }