| commit | 6f62816ef1212a501d5f6c27110e2e5d81a6ebe2 | [log] [tgz] |
|---|---|---|
| author | Rick Ellis <rick.ellis@ellislab.com> | Fri Nov 24 01:17:45 2006 +0000 |
| committer | Rick Ellis <rick.ellis@ellislab.com> | Fri Nov 24 01:17:45 2006 +0000 |
| tree | 8d699b285e18b5a25608839cb3d9b82642a2f44b | |
| parent | d1c638f0e9d1d838d80ff3641f1dc889f488cbf6 [diff] |
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php index 41c0a9b..0947046 100644 --- a/system/libraries/Loader.php +++ b/system/libraries/Loader.php
@@ -146,7 +146,7 @@ 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 = '';