summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2010-10-11 22:37:16 +0200
committerGreg Aker <greg.aker@ellislab.com>2010-10-11 22:37:16 +0200
commitbce1348820118ea750224c17d81846229dff4852 (patch)
tree85c8eceb4fc95856254f3403777ef0fabd0b78c7
parent3934a4a803ee2069ac7622e4c2565fb5fee11ce9 (diff)
Fixed a bug where CI_Model is always loaded in core/Loader.php, regardless of if the class is instantiated or not.
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 292fdc955..316985609 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -177,7 +177,7 @@ class CI_Loader {
$CI->load->database($db_conn, FALSE, TRUE);
}
- if ( ! class_exists('Model'))
+ if ( ! class_exists('CI_Model'))
{
load_class('Model', 'core');
}