diff options
| author | Andrey Andreev <narf@devilix.net> | 2016-02-24 11:15:00 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2016-02-24 11:15:00 +0100 |
| commit | e3af21d31a828c195b8bfa4b1aec9ecd052b53ce (patch) | |
| tree | 1c46746b565abffe15db53c905f246b92325cf07 | |
| parent | a7bd30c75e844f133b6aa8aae7c64e6cf9ce143a (diff) | |
| parent | 97d0878bd3bf3c90364f85ad541c6a078b93c3f1 (diff) | |
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
| -rw-r--r-- | system/core/Loader.php | 2 | ||||
| -rw-r--r-- | system/libraries/Session/Session.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 80de804ea..62781a7bf 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -321,7 +321,7 @@ class CI_Loader { } $model = ucfirst($model); - if ( ! class_exists($model)) + if ( ! class_exists($model, FALSE)) { foreach ($this->_ci_model_paths as $mod_path) { diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php index b93c00c15..77c56ae70 100644 --- a/system/libraries/Session/Session.php +++ b/system/libraries/Session/Session.php @@ -231,7 +231,7 @@ class CI_Session { } } - if ( ! class_exists($prefix.$class) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$prefix.$class.'.php')) + if ( ! class_exists($prefix.$class, FALSE) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$prefix.$class.'.php')) { require_once($file_path); if (class_exists($prefix.$class, FALSE)) |