Changeset 1596

Timestamp:

12/20/2007 04:34:46 PM (10 months ago)

Author:

Shadowhand

Message:

Changed ORM::find($id) to ORM::find($id, $return = TRUE) and fixed internal calls to match new syntax.

Files:

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

trunk/system/libraries/ORM.php

@@ -106 +106 @@
                         {
                                 // Query and load object
-                                $this->find($id);
+                                $this->find($id, FALSE);
                         }
                 }
@@ -449 +449 @@
          * Find and load data for the current object.
          *
-         * @param   string  id of the object to find, or ALL
-         * @return  object  current object
-         * @return  array   if ALL is used
-         */
-        public function find($id = FALSE)
+         * @param   string   id of the object to find, or ALL
+         * @param   boolean  return the result, or load it into the current object
+         * @return  object   object instance
+         * @return  array    if ALL is used
+         */
+        public function find($id = FALSE, $return = TRUE)
         {
                 // Allows the use of find(ALL)
@@ -466 +467 @@
 
                 // Load the result of the query
-                return $this->load_result(FALSE);
+                return $this->load_result(FALSE, $return);
         }
 
@@ -477 +478 @@
         {
                 // Return an array of objects
-                return $this->load_result(TRUE);
+                return $this->load_result(TRUE, TRUE);
         }
 
@@ -631 +632 @@
          *  array   - Multiple row result set
          */
-        protected function load_result($array = FALSE)
+        protected function load_result($array = FALSE, $return = FALSE)
         {
                 // Make sure there is something to select
@@ -663 +664 @@
                         else
                         {
-                                // Fetch the first result
+                                if ($return === TRUE)
+                                {
+                                        // Return the first result
+                                        return ORM::instance($this->class, $result->current());
+                                }
+
+                                // Load the first result
                                 $this->object = $result->current();
                         }