Changeset 2915

Timestamp:

06/25/2008 06:16:17 PM (4 months ago)

Author:

Shadowhand

Message:

Optimizations to ORM

Files:

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

trunk/system/libraries/ORM.php

@@ -292 +292 @@
                 {
                         // Make a find_related call
-                        return $this->call_find_related($method, $args);
-                }
-
-                if (preg_match('/^(has|add|remove)_(.+)/', $method, $matches))
+                        return $this->call_find_related(substr($method, 13), $args);
+                }
+
+                if (preg_match('/^(has|add|remove)_(.+)$/', $method, $matches))
                 {
                         if (empty($this->object->id))
@@ -423 +423 @@
          * @return  object
          */
-        protected function call_find_related($method, $args)
-        {
-                // Extract table name
-                $table = substr($method, 13);
-
+        protected function call_find_related($table, $args)
+        {
                 // Construct a new model
                 $model = $this->load_model($table);
@@ -485 +482 @@
         {
                 $action = $matches[1];
-                $model  = is_object(current($args)) ? current($args) : $this->load_model($matches[2]);
+                $model  = (count($args) > 0 AND is_object($args[0])) ? $args[0] : $this->load_model($matches[2]);
 
                 // Real foreign table name