Commit 3c6eb600 authored by Jonathan.Wage's avatar Jonathan.Wage

Fixes for auto completing relationships.

parent 8cc2c977
...@@ -241,12 +241,14 @@ class Doctrine_Import_Schema ...@@ -241,12 +241,14 @@ class Doctrine_Import_Schema
if( isset($this->relations[$relation['class']]) && is_array($this->relations[$relation['class']]) ) { if( isset($this->relations[$relation['class']]) && is_array($this->relations[$relation['class']]) ) {
foreach($this->relations[$relation['class']] as $otherRelation) { foreach($this->relations[$relation['class']] as $otherRelation) {
if(isset($otherRelation['refClass']) && $otherRelation['refClass']==$className) // skip fully defined m2m relationships // skip fully defined m2m relationships
return; if(isset($otherRelation['refClass']) && $otherRelation['refClass'] == $className) {
continue(2);
}
} }
} else {
$this->relations[$relation['class']][$className] = $newRelation;
} }
$this->relations[$relation['class']][$className] = $newRelation;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment