Doctrine

Timestamp:

10/21/08 21:45:16 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1531

Location:

branches

Files:

• 1.0/lib/Doctrine/Data/Import.php (modified) (1 diff)
• 1.1/lib/Doctrine/Data/Import.php (modified) (1 diff)

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

@@ -240 +240 @@
 
             if (Doctrine::getTable($className)->isTree()) {
-                $nestedSets[$className][] = $data;
-                $this->_buildNestedSetRows($className, $data);
+                $first = current($data);
+                if (isset($first['children'])) {
+                    $nestedSets[$className][] = $data;
+                    $this->_buildNestedSetRows($className, $data);
+                } else {
+                    $this->_buildRows($className, $data);
+                }
             } else {
                 $this->_buildRows($className, $data);

branches/1.1/lib/Doctrine/Data/Import.php

@@ -240 +240 @@
 
             if (Doctrine::getTable($className)->isTree()) {
-                $nestedSets[$className][] = $data;
-                $this->_buildNestedSetRows($className, $data);
+                $first = current($data);
+                if (isset($first['children'])) {
+                    $nestedSets[$className][] = $data;
+                    $this->_buildNestedSetRows($className, $data);
+                } else {
+                    $this->_buildRows($className, $data);
+                }
             } else {
                 $this->_buildRows($className, $data);