summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-09-07 07:41:28 +0200
committerAndrey Andreev <narf@bofh.bg>2012-09-07 07:41:28 +0200
commit68b82e7ad682c40de22a9792ffe429d27cf42cf0 (patch)
tree106d9607cc84bca7d1c621065c973aba64313af4 /system/database
parentcbc768d8beb777879f5d5517cdaefbfd903450c3 (diff)
parent747a326c22c335a4c55df77762164b2b9626f919 (diff)
Merge pull request #1776 from eweap/db-display-error
Database display error supporting "Loader.php" and "MY_Loader.php"
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 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']);