diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-05-17 14:06:46 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-05-17 14:06:46 +0200 |
| commit | d4d80223ccef8fd3606f3a89d33afbfe95226bd8 (patch) | |
| tree | 85d5ee9d60270b605ba1a9dc3bd50a26274667cc /system | |
| parent | 88e7ad52dc59db7dd28179db6e251eb6b538e97d (diff) | |
| parent | fadb82230ba29b4c8a1e5f97092f7d775491f340 (diff) | |
Merge pull request #2442 from vlakoff/develop-3
Do not trigger a possible custom autoloader, as it is irrelevant here
Diffstat (limited to 'system')
| -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 0a5cf5b84..49bd641b1 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'); |