summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-06-21 16:21:29 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-06-21 16:21:29 +0200
commitcacabd6fac8a184723f5269643adc4c12ca1ab2f (patch)
tree7fa84f0f76f9c9d5b47f0ce3252754980a68083f /system/database
parent3b6af434b13168828429d06aae7699f6f9537a87 (diff)
parent8d3099d4e5261e0f044c7fcd8b3ab7724645aa8d (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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 4ec20f45d..a99444167 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1281,7 +1281,7 @@ abstract class CI_DB_driver {
if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE)
{
// Found it - use a relative path for safety
- $message[] = 'Filename: '.str_replace(array(BASEPATH, APPPATH), '', $call['file']);
+ $message[] = 'Filename: '.str_replace(array(APPPATH, BASEPATH), '', $call['file']);
$message[] = 'Line Number: '.$call['line'];
break;
}