diff options
| author | Jonathan Bonnefoy <contact@e-weap.fr> | 2012-09-05 15:41:42 +0200 |
|---|---|---|
| committer | Jonathan Bonnefoy <contact@e-weap.fr> | 2012-09-05 15:41:42 +0200 |
| commit | 44558109c8fc0ae7a223e6fae6b44f6598b2d3ad (patch) | |
| tree | dd11a88e55d3e7f8a6ef48280504ad669326f726 | |
| parent | 9ffcee60140b20ca3ec4e7688f83a039c7c080f7 (diff) | |
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..76f9433d2 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 && preg_match('#core/(MY_)?Loader#', $call['file']) === 0 ) { // 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 |