summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Loader.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 8438cc0bb..e634c3885 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -154,7 +154,10 @@ class CI_Loader {
$CI->load->database($db_conn, FALSE, TRUE);
}
- load_class('Model', false);
+ if ( ! class_exists('Model'))
+ {
+ require_once(BASEPATH.'libraries/Model'.EXT);
+ }
require_once(APPPATH.'models/'.$path.$model.EXT);