Changeset 3167

Timestamp:

07/20/2008 06:52:52 PM (4 months ago)

Author:

Shadowhand

Message:

Fixing #481, thanks Xobb.

Files:

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

trunk/system/libraries/ORM.php

@@ -601 +601 @@
         public function delete($id = NULL)
         {
-                if ($this->loaded === TRUE)
-                {
-                        // Delete this object
-                        $this->db->where($this->primary_key, $this->object[$this->primary_key])->delete($this->table_name);
-                }
+                if ($id === NULL AND $this->loaded)
+                {
+                        // Use the the primary key value
+                        $id = $this->object[$this->primary_key];
+                }
+
+                // Delete this object
+                $this->db->where($this->primary_key, $id)->delete($this->table_name);
 
                 return $this->clear();