diff options
author | vlakoff <vlakoff@gmail.com> | 2013-05-12 10:57:09 +0200 |
---|---|---|
committer | vlakoff <vlakoff@gmail.com> | 2013-05-12 10:57:09 +0200 |
commit | fadb82230ba29b4c8a1e5f97092f7d775491f340 (patch) | |
tree | 14fac7027f8168172d0e51a197a2764cf9db9793 | |
parent | 206d951e3da15bf9c69b3b8860c8bd274fb82b6f (diff) |
Do not trigger a possible custom autoloader, as it is irrelevant here
These were the last two calls of class_exists() without the $autoloader = FALSE argument.
-rw-r--r-- | system/core/Loader.php | 2 | ||||
-rw-r--r-- | system/database/DB_driver.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index d4e63231c..6f90aec8b 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -658,7 +658,7 @@ class CI_Loader { return FALSE; } - if ( ! class_exists('CI_Driver_Library')) + if ( ! class_exists('CI_Driver_Library', FALSE)) { // We aren't instantiating an object here, just making the base class available require BASEPATH.'libraries/Driver.php'; diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 9239dc154..593d78ba4 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -704,7 +704,7 @@ abstract class CI_DB_driver { { $driver = 'CI_DB_'.$this->dbdriver.'_result'; - if ( ! class_exists($driver)) + if ( ! class_exists($driver, FALSE)) { include_once(BASEPATH.'database/DB_result.php'); include_once(BASEPATH.'database/drivers/'.$this->dbdriver.'/'.$this->dbdriver.'_result.php'); |