diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
commit | ea7a866f6107d4b50b4a7059f1373035aa12dd23 (patch) | |
tree | bf3c2d9f16d098358108f4ad609cf2b068c45ba6 /system/database/DB_driver.php | |
parent | 9ac557f2473844f3c2207189f371f827dbaddb71 (diff) | |
parent | 580fe8ec482f5df7ca5b91e11b13b72a8f3ed0b8 (diff) |
Merge changes from develop
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index b12042bde..ea2a53eb2 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1363,7 +1363,7 @@ abstract class CI_DB_driver { $call['file'] = str_replace('\\', '/', $call['file']); } - if (isset($call['file'], $call['class']) && strpos($call['file'], $basepath.'database') === FALSE && strpos($call['class'], 'Loader') !== FALSE) + if (isset($call['file'], $call['class']) && strpos($call['file'], BASEPATH.'database') === FALSE && strpos($call['class'], 'Loader') !== FALSE) { // Found it - use a relative path for safety $message[] = 'Filename: '.str_replace(array(APPPATH, BASEPATH), '', $call['file']); |