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:18:22 +0100
commit738b9e30404a56a8e2e8053f024550232b72ea09 (patch)
tree3fd573191b957bcfd7639ca591f3491abd9329f9
parent86d2ec40b47f885a6d7e28b9dd519fac3332e7ae (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))