Changeset 2575 for trunk/system/libraries/drivers/Database/Mysql.php

Timestamp:

04/25/2008 02:09:17 PM (7 months ago)

Author:

zombor

Message:

Fixing #572.

Files:

• trunk/system/libraries/drivers/Database/Mysql.php (modified) (1 diff)

trunk/system/libraries/drivers/Database/Mysql.php

@@ -413 +413 @@
                 // NOTE - The class set by $type must be defined before fetching the result,
                 // autoloading is disabled to save a lot of stupid overhead.
-                if ($this->fetch_type == 'mysql_fetch_object')
-                {
-                        $this->return_type = class_exists($type, FALSE) ? $type : 'stdClass';
+                if ($this->fetch_type == 'mysql_fetch_object' AND $object === TRUE)
+                {
+                        if (is_string($type))
+                        {
+                                $loaded = Kohana::auto_load($type);
+                                $this->return_type = $loaded ? $type : 'stdClass';
+                        }
+                        else
+                        {
+                                $this->return_type = 'stdClass';
+                        }
                 }
                 else