Commit 53eb2ea0 authored by phuson's avatar phuson

revert change because it was breaking something else...needs to think of another way to do this.

parent 324a0707
......@@ -210,19 +210,7 @@ class Doctrine_Import_Schema
*/
public function getRelations($properties)
{
$all_relations = isset($this->_relations[$properties['className']]) ? $this->_relations[$properties['className']]:array();
// This is for checking for duplicates between alias-relations and a auto-generated relations to ensure the result set of unique relations
$exist_relations = array();
$unique_relations = array();
foreach ($all_relations as $relation) {
if (!in_array($relation['class'], $exist_relations)) {
$exist_relations[] = $relation['class'];
$unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
}
}
return $unique_relations;
return isset($this->_relations[$properties['className']]) ? $this->_relations[$properties['className']]:array();
}
/**
......
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