Changeset 1893

Timestamp:

01/31/2008 03:38:02 PM (11 months ago)

Author:

Shadowhand

Message:

Quick fixes:

• Set properties on config/email, and helpers/email
  
• Added child<>parent one<>one transparency to ORM
  

Location:

trunk/system

Files:

• config/email.php (modified) (3 props)
• helpers/email.php (modified) (1 diff, 3 props)
• libraries/ORM.php (modified) (1 diff)

trunk/system/helpers/email.php

@@ -3 +3 @@
  * Email helper class.
  *
- * $Id: valid.php 1865 2008-01-29 19:48:29Z Geert $
+ * $Id$
  *
  * @package    Validation

trunk/system/libraries/ORM.php

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