summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-05-17 14:06:46 +0200
committerAndrey Andreev <narf@devilix.net>2013-05-17 14:06:46 +0200
commitd4d80223ccef8fd3606f3a89d33afbfe95226bd8 (patch)
tree85d5ee9d60270b605ba1a9dc3bd50a26274667cc /system/database
parent88e7ad52dc59db7dd28179db6e251eb6b538e97d (diff)
parentfadb82230ba29b4c8a1e5f97092f7d775491f340 (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/database')
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
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');