Doctrine

Timestamp:

08/27/08 03:01:36 (10 months ago)

Author:

jwage

Message:

fixes #1360

Files:

• branches/1.0/lib/Doctrine/Import/Schema.php (modified) (2 diffs)

branches/1.0/lib/Doctrine/Import/Schema.php

@@ -473 +473 @@
         
         foreach ($array as $className => $definition) {
-            $parent = $this->_findBaseSuperClass($array, $definition['className']);
             // Move any definitions on the schema to the parent
             if (isset($definition['inheritance']['extends']) && isset($definition['inheritance']['type']) && ($definition['inheritance']['type'] == 'simple' || $definition['inheritance']['type'] == 'column_aggregation')) {
+                $parent = $this->_findBaseSuperClass($array, $definition['className']);
                 foreach ($moves as $move => $resetValue) {
                     $array[$parent][$move] = Doctrine_Lib::arrayDeepMerge($array[$parent][$move], $definition[$move]);
@@ -500 +500 @@
     protected function _findBaseSuperClass($array, $class)
     {
-        if (isset($array[$class]['inheritance']['extends'])) {
+        if (isset($array[$class]['inheritance']['extends']) && isset($array[$class]['inheritance']['type']) && ($array[$class]['inheritance']['type'] == 'simple' || $array[$class]['inheritance']['type'] == 'column_aggregation')) {
             return $this->_findBaseSuperClass($array, $array[$class]['inheritance']['extends']);
         } else {