diff options
| author | Alex Bilbie <alex@alexbilbie.com> | 2012-09-19 17:17:18 +0200 |
|---|---|---|
| committer | Alex Bilbie <alex@alexbilbie.com> | 2012-09-19 17:17:18 +0200 |
| commit | a434f90f1fb15abc494b18126dc3563f12d2b9b3 (patch) | |
| tree | a80f7fe213c708c7282f2fbe791a5d7861dd5d32 /system/database | |
| parent | 935d42f91a55a409ca02857ef1ef660c921ff1db (diff) | |
| parent | c2300c827f769ecde286419fcab29c4ec9698822 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'system/database')
| -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 9628e9a9e..e61af91b7 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1353,7 +1353,7 @@ abstract class CI_DB_driver { $trace = debug_backtrace(); foreach ($trace as $call) { - if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE && isset($call['class']) && 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']); |