Changeset 1085

Timestamp:

11/11/2007 01:31:18 AM (13 months ago)

Author:

Shadowhand

Message:

Fixed a bug that prevented Models from being loaded before the Kohana instance is available. Thanks Armen!

Files:

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

trunk/system/libraries/Model.php

@@ -12 +12 @@
         /*
          * Constructor: __construct
-         *  Loads database into '$this->db'.
+         *  Loads database to $this->db.
          */
         public function __construct()
         {
                 // Load the database into the model
-                $this->db = isset(Kohana::instance()->db) ? Kohana::instance()->db : new Database('default');
+                if (Event::has_run('system.pre_controller'))
+                {
+                        $this->db = isset(Kohana::instance()->db) ? Kohana::instance()->db : new Database('default');
+                }
+                else
+                {
+                        $this->db = new Database('default');
+                }
         }