diff options
author | Rick Ellis <rick.ellis@ellislab.com> | 2006-11-24 02:17:45 +0100 |
---|---|---|
committer | Rick Ellis <rick.ellis@ellislab.com> | 2006-11-24 02:17:45 +0100 |
commit | 6f62816ef1212a501d5f6c27110e2e5d81a6ebe2 (patch) | |
tree | 8d699b285e18b5a25608839cb3d9b82642a2f44b /system/libraries/Loader.php | |
parent | d1c638f0e9d1d838d80ff3641f1dc889f488cbf6 (diff) |
Diffstat (limited to 'system/libraries/Loader.php')
-rw-r--r-- | system/libraries/Loader.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 41c0a9b94..0947046ed 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php @@ -146,7 +146,7 @@ class CI_Loader { show_error('Unable to locate the model you have specified: '.$model); } - if ($db_conn !== FALSE) + if ($db_conn !== FALSE AND ! class_exists('CI_DB')) { if ($db_conn === TRUE) $db_conn = ''; |