diff options
| author | Derek Allard <derek.allard@ellislab.com> | 2007-02-15 19:42:22 +0100 |
|---|---|---|
| committer | Derek Allard <derek.allard@ellislab.com> | 2007-02-15 19:42:22 +0100 |
| commit | ac0eb4543ce713d0d25125614489de3b8b2fd296 (patch) | |
| tree | 1bc58a32ae70741020dae02e6ce699cd305109f2 /system | |
| parent | a8b10bed6b1064548b8af605e5b16113b457de02 (diff) | |
reverted a change user testing revealed a flaw.
Diffstat (limited to 'system')
| -rw-r--r-- | system/libraries/Loader.php | 5 |
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);
|