Changeset 2180

Timestamp:

02/27/2008 03:04:49 PM (11 months ago)

Author:

Shadowhand

Message:

Better handling of transparent one<>one relationships.

Files:

• trunk/system/libraries/ORM.php (modified) (1 diff)

trunk/system/libraries/ORM.php

@@ -130 +130 @@
                         return $this->object->$key;
                 }
-                elseif ( ! empty($this->object->id) AND (in_array($key, $this->has_one) OR in_array($key, $this->belongs_to)))
+                elseif (in_array($key, $this->has_one) OR in_array($key, $this->belongs_to))
                 {
                         // Set the model name
                         $model = ucfirst($key).'_Model';
 
-                        // Set the child id name
-                        $child_id = $key.'_id';
-
-                        $this->object->$key = new $model(isset($this->object->$child_id)
-                                // Get the foreign object using the key defined in this object
-                                ? $this->object->$child_id
-                                // Get the foreign object using the primary key of this object
-                                : array($this->class.'_id', $this->object->id));
+                        if (empty($this->object->id))
+                        {
+                                // Load an empty model
+                                $this->object->$key = new $model;
+                        }
+                        else
+                        {
+                                // Set the child id name
+                                $child_id = $key.'_id';
+
+                                $this->object->$key = new $model(isset($this->object->$child_id)
+                                        // Get the foreign object using the key defined in this object
+                                        ? $this->object->$child_id
+                                        // Get the foreign object using the primary key of this object
+                                        : array($this->class.'_id', $this->object->id));
+                        }
 
                         // Return the model