From 72d61337496738d276d7671f0e07f201713aec6a Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 30 Jan 2008 20:52:22 +0000 Subject: Fixed bug #1813 - added check for $CI->db isset() and is_object() before returning false in Loader::database() --- system/libraries/Loader.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'system/libraries') diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index a59d6e38e..576cb11f3 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -193,8 +193,11 @@ class CI_Loader { */ function database($params = '', $return = FALSE, $active_record = FALSE) { + // Grab the super object + $CI =& get_instance(); + // Do we even need to load the database class? - if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE) + if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE AND isset($CI->db) AND is_object($CI->db)) { return FALSE; } @@ -205,9 +208,6 @@ class CI_Loader { { return DB($params, $active_record); } - - // Grab the super object - $CI =& get_instance(); // Initialize the db variable. Needed to prevent // reference errors with some configurations -- cgit v1.2.3-24-g4f1b