diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-09-07 07:41:28 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-09-07 07:41:28 +0200 |
| commit | 68b82e7ad682c40de22a9792ffe429d27cf42cf0 (patch) | |
| tree | 106d9607cc84bca7d1c621065c973aba64313af4 | |
| parent | cbc768d8beb777879f5d5517cdaefbfd903450c3 (diff) | |
| parent | 747a326c22c335a4c55df77762164b2b9626f919 (diff) | |
Merge pull request #1776 from eweap/db-display-error
Database display error supporting "Loader.php" and "MY_Loader.php"
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 4296815f8..9628e9a9e 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) + if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE && isset($call['class']) && strpos($call['class'], 'Loader') !== FALSE) { // Found it - use a relative path for safety $message[] = 'Filename: '.str_replace(array(APPPATH, BASEPATH), '', $call['file']); diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 578e60ec0..ce45f8f03 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -143,6 +143,7 @@ Release Date: Not Released - Added capability for packages to hold database.php config files - Added subdrivers support (currently only used by PDO). - Added client compression support for MySQL and MySQLi. + - Removed Loader class from Database error to better find the likely culprit. - Libraries |