RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-1534'

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-04-07 10:43:05 +02:00
commit 022d27e4e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
View File

@ -412,9 +412,6 @@ class YamlDriver extends AbstractFileDriver
if (isset($manyToManyElement['mappedBy'])) { if (isset($manyToManyElement['mappedBy'])) {
$mapping['mappedBy'] = $manyToManyElement['mappedBy']; $mapping['mappedBy'] = $manyToManyElement['mappedBy'];
} else if (isset($manyToManyElement['joinTable'])) { } else if (isset($manyToManyElement['joinTable'])) {
if (isset($manyToManyElement['inversedBy'])) {
$mapping['inversedBy'] = $manyToManyElement['inversedBy'];
}
$joinTableElement = $manyToManyElement['joinTable']; $joinTableElement = $manyToManyElement['joinTable'];
$joinTable = array( $joinTable = array(
@ -444,6 +441,10 @@ class YamlDriver extends AbstractFileDriver
$mapping['joinTable'] = $joinTable; $mapping['joinTable'] = $joinTable;
} }
if (isset($manyToManyElement['inversedBy'])) {
$mapping['inversedBy'] = $manyToManyElement['inversedBy'];
}
if (isset($manyToManyElement['cascade'])) { if (isset($manyToManyElement['cascade'])) {
$mapping['cascade'] = $manyToManyElement['cascade']; $mapping['cascade'] = $manyToManyElement['cascade'];
} }