summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-02-24 11:14:10 +0100
committerAndrey Andreev <narf@devilix.net>2016-02-24 11:14:10 +0100
commit97d0878bd3bf3c90364f85ad541c6a078b93c3f1 (patch)
tree922d2820f9948fde066eac46045734b23dac73ba
parenta64d2262e37ea9308865f5d81c1b1ccdfaa52721 (diff)
parent82d5c231d55aa290a2739d01055a9b8e6c8243a6 (diff)
Merge pull request #4480 from versalle88/develop
Changed class_exists() calls to ignore __autoload()
-rw-r--r--system/core/Loader.php2
-rw-r--r--system/libraries/Session/Session.php2
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))