Changeset 2090

Timestamp:

02/20/2008 06:57:20 PM (11 months ago)

Author:

Shadowhand

Message:

ORM models should not re-find when they are woken up. What the hell was I thinking?

Files:

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

trunk/system/libraries/ORM.php

@@ -116 +116 @@
                 // Connect to the database
                 $this->connect();
-
-                // Reload the internal object
-                empty($this->object->id) or $this->find($this->object->id);
         }
 
@@ -467 +464 @@
         protected function where_key($id = NULL)
         {
-                return 'id';
+                return $this->table.'.id';
         }