From 6f62816ef1212a501d5f6c27110e2e5d81a6ebe2 Mon Sep 17 00:00:00 2001 From: Rick Ellis Date: Fri, 24 Nov 2006 01:17:45 +0000 Subject: --- system/libraries/Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/libraries/Loader.php') 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 = ''; -- cgit v1.2.3-24-g4f1b