summaryrefslogtreecommitdiffstats
path: root/system/libraries/Loader.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2009-12-05 16:32:48 +0100
committerDerek Jones <derek.jones@ellislab.com>2009-12-05 16:32:48 +0100
commit9fb6dd19f74c72cb98b6108a42575a98d3a9ba0c (patch)
treeaa2bb520c34450e8c40226bc1b60bd002fde822d /system/libraries/Loader.php
parentffca6c2202f89249d3bc50b5645b94c772ff3b0d (diff)
tweak in database() to match change to $active_record variable
Diffstat (limited to 'system/libraries/Loader.php')
-rw-r--r--system/libraries/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 710c5c148..60c495820 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -204,7 +204,7 @@ class CI_Loader {
$CI =& get_instance();
// Do we even need to load the database class?
- if (class_exists('CI_DB') AND $return == FALSE AND $active_record == FALSE AND isset($CI->db) AND is_object($CI->db))
+ if (class_exists('CI_DB') AND $return == FALSE AND $active_record == NULL AND isset($CI->db) AND is_object($CI->db))
{
return FALSE;
}