From cc01ca4686b853700a895e03bab251ad8aa5a58a Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 29 May 2007 18:55:46 +0000
Subject: [PATCH]

---
 lib/Doctrine/Relation/ForeignKey.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/Relation/ForeignKey.php b/lib/Doctrine/Relation/ForeignKey.php
index 440794aa6..3433732f7 100644
--- a/lib/Doctrine/Relation/ForeignKey.php
+++ b/lib/Doctrine/Relation/ForeignKey.php
@@ -51,7 +51,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation
            }
         }
         if ($this->isOneToOne()) {
-            if (empty($id)) {
+            if ( ! $record->exists() || empty($id)) {
                 $related = $this->getTable()->create();
             } else {
                 $dql  = 'FROM ' . $this->getTable()->getComponentName()
@@ -65,7 +65,7 @@ class Doctrine_Relation_ForeignKey extends Doctrine_Relation
 
         } else {
 
-            if (empty($id)) {
+            if ( ! $record->exists() || empty($id)) {
                 $related = new Doctrine_Collection($this->getTable());
             } else {
                 $query      = $this->getRelationDql(1);