1
0
mirror of synced 2025-01-18 22:41:43 +03:00

Fixes for auto completing relationships.

This commit is contained in:
Jonathan.Wage 2007-10-08 18:46:38 +00:00
parent 8cc2c977f0
commit 3c6eb60037

View File

@ -241,12 +241,14 @@ class Doctrine_Import_Schema
if( isset($this->relations[$relation['class']]) && is_array($this->relations[$relation['class']]) ) {
foreach($this->relations[$relation['class']] as $otherRelation) {
if(isset($otherRelation['refClass']) && $otherRelation['refClass']==$className) // skip fully defined m2m relationships
return;
// skip fully defined m2m relationships
if(isset($otherRelation['refClass']) && $otherRelation['refClass'] == $className) {
continue(2);
}
}
} else {
$this->relations[$relation['class']][$className] = $newRelation;
}
$this->relations[$relation['class']][$className] = $newRelation;
}
}
}