Merge pull request #4480 from versalle88/develop
Changed class_exists() calls to ignore __autoload()
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 80de804..62781a7 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -321,7 +321,7 @@
}
$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 b93c00c..77c56ae 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -231,7 +231,7 @@
}
}
- 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))