Doctrine

Timestamp:

12/17/08 23:23:14 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixes issue with data fixtures exporting with foreign keys (closes #1665)

Location:

branches

Files:

• 1.0/lib/Doctrine/Data/Export.php (modified) (2 diffs)
• 1.1/lib/Doctrine/Data/Export.php (modified) (2 diffs)

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

@@ -174 +174 @@
 
                     if ($relation = $this->isRelation($record, $key)) {
+                        if ( ! $value) {
+                            continue;
+                        }
                         $relationAlias = $relation['alias'];
                         $relationRecord = $record->$relationAlias;
@@ -183 +186 @@
 
                         // If relation is null or does not exist then continue
-                        if ($relationRecord instanceof Doctrine_Null || !$relationRecord) {
+                        if ($relationRecord instanceof Doctrine_Null || ! $relationRecord) {
                             continue;
                         }

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

@@ -174 +174 @@
 
                     if ($relation = $this->isRelation($record, $key)) {
+                        if ( ! $value) {
+                            continue;
+                        }
                         $relationAlias = $relation['alias'];
                         $relationRecord = $record->$relationAlias;
@@ -183 +186 @@
 
                         // If relation is null or does not exist then continue
-                        if ($relationRecord instanceof Doctrine_Null || !$relationRecord) {
+                        if ($relationRecord instanceof Doctrine_Null || ! $relationRecord) {
                             continue;
                         }