Changeset 2312

Timestamp:

03/17/2008 10:01:21 AM (10 months ago)

Author:

Shadowhand

Message:

Follow up to r2311

Files:

• trunk/system/libraries/ORM.php (modified) (3 diffs)

trunk/system/libraries/ORM.php

@@ -556 +556 @@
                         return $this->find_all();
 
+                // To allow the object to be reloaded
+                ($id === TRUE) and $id = $this->id;
+
                 // Generate WHERE
                 if ($this->where === FALSE AND ! empty($id))
                 {
-                        if ($id === TRUE)
-                        {
-                                self::$db->where($this->object->id);
-                        }
-                        elseif (is_array($id))
+                        if (is_array($id))
                         {
                                 self::$db->where($id);
@@ -609 +608 @@
                 }
 
-                if ($this->object->id == '')
+                if (empty($this->object->id))
                 {
                         // Perform an insert
                         $query = self::$db->insert($this->table, $data);
 
-                        if ($query->count() === 1)
+                        if ($query->count())
                         {
                                 // Set current object id by the insert id
@@ -626 +625 @@
                 }
 
-                if ($query->count() === 1)
+                if ($query->count())
                 {
                         // Reset changed data
                         $this->changed = array();
+
+                        // Reset SELECT, WHERE, and FROM
+                        $this->select = $this->where = $this->from = FALSE;
 
                         return TRUE;