Merge pull request #2 from JamesAndJamesFulfilment/f-tdt-701

TDT-701 remove duplication

Author: akhumphrey

lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -565,26 +565,27 @@ public function getColumns()
     $parentColumns = $parentModel ? array_keys(Doctrine_Core::getTable($parentModel)->getColumns()) : array();
 
     $columns = array();
+    $names   = array();
     foreach (array_diff(array_keys($this->table->getColumns()), $parentColumns) as $name)
     {
       $columns[] = new sfDoctrineColumn($name, $this->table);
+      $names[]   = $name;
     }
 
     // add relations to columns for inherited classes
     if ($parentModel)
     {
       $parentRelationNames = array_keys(Doctrine_Core::getTable($parentModel)->getRelations());
       $relations = $this->table->getRelations();
-      $relationColumns = array();
       foreach (array_diff(array_keys($relations), $parentRelationNames) as $relationName)
       {
         if (Doctrine_Relation::ONE == $relations[$relationName]->getType())
         {
           $columnName = $relations[$relationName]->getLocal();
-          if (!in_array($columnName, $relationColumns))
+          if (!in_array($columnName, $names))
           {
-            $relationColumns[] = $columnName;
             $columns[] = new sfDoctrineColumn($columnName, $this->table);
+            $names[]   = $columnName;
           }
         }
       }