summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-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 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 = '';