summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorJonathan Bonnefoy <contact@e-weap.fr>2012-09-05 18:17:21 +0200
committerJonathan Bonnefoy <contact@e-weap.fr>2012-09-05 18:17:21 +0200
commit747a326c22c335a4c55df77762164b2b9626f919 (patch)
treeef96b6a1e60a848fb2f4636658ace211601d1ddf /system/database
parent44558109c8fc0ae7a223e6fae6b44f6598b2d3ad (diff)
Check for "Loader" in $call['class'] instead of $call['file']
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 76f9433d2..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 && preg_match('#core/(MY_)?Loader#', $call['file']) === 0 )
+ 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']);