diff options
| author | versalle88 <andrew.versalle@gmail.com> | 2016-02-23 17:44:35 +0100 |
|---|---|---|
| committer | versalle88 <andrew.versalle@gmail.com> | 2016-02-23 17:44:35 +0100 |
| commit | 7230d5dea1e2fa6b242df2b840ad2dc54f0306b0 (patch) | |
| tree | 70436fb5a1f9303e5f8b711a9ab0bae7c25162f2 | |
| parent | a64d2262e37ea9308865f5d81c1b1ccdfaa52721 (diff) | |
Changed calls to class_exists to ignore __autoload() to match other calls
| -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..c6413c102 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)) |