Changeset 2026 for trunk/system/libraries/ORM.php

Timestamp:

02/10/2008 12:46:49 PM (10 months ago)

Author:

Shadowhand

Message:

Fixing #393, thanks joeles.

Files:

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

trunk/system/libraries/ORM.php

@@ -661 +661 @@
                 $result = self::$db->get($this->table)->result(TRUE);
 
-                if ($count = $result->count())
-                {
-                        if ($count > 1 OR $array == TRUE)
-                        {
-                                // Model class name
-                                $class = get_class($this);
-
-                                return new ORM_Iterator($class, $result);
+                if ($array === TRUE)
+                {
+                        // Create a new ORM iterator of the result
+                        return new ORM_Iterator(get_class($this), $result);
+                }
+                else
+                {
+                        if ($return === TRUE)
+                        {
+                                // Return the first result
+                                return ORM::factory($this->class, $result->current());
+                        }
+
+                        // Load the first result, if there is only one result
+                        if ($result->count() === 1)
+                        {
+                                $this->object = $result->current();
                         }
                         else
                         {
-                                if ($return === TRUE)
-                                {
-                                        // Return the first result
-                                        return ORM::factory($this->class, $result->current());
-                                }
-
-                                // Load the first result
-                                $this->object = $result->current();
-                        }
-                }
-                else
-                {
-                        if ($array == TRUE)
-                        {
-                                // Return an empty array when an array is requested
-                                return array();
-                        }
-
-                        // Reset the object
-                        $this->clear();
+                                $this->clear();
+                        }
                 }