Check for "Loader" in $call['class'] instead of $call['file']

eweap · eweap · commit 747a326c22c3 · 2012-09-05T18:17:21.000+02:00
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -1353,7 +1353,7 @@ public function display_error($error = '', $swap = '', $native = FALSE)
 		$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']);

Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,7 @@ public function display_error($error = '', $swap = '', $native = FALSE)`
`1353`	`1353`	`$trace = debug_backtrace();`
`1354`	`1354`	`foreach ($trace as $call)`
`1355`	`1355`	`{`
`1356`		`- if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE && preg_match('#core/(MY_)?Loader#', $call['file']) === 0 )`
	`1356`	`+ if (isset($call['file']) && strpos($call['file'], BASEPATH.'database') === FALSE && isset($call['class']) && strpos($call['class'], 'Loader') !== FALSE)`
`1357`	`1357`	`{`
`1358`	`1358`	`// Found it - use a relative path for safety`
`1359`	`1359`	`$message[] = 'Filename: '.str_replace(array(APPPATH, BASEPATH), '', $call['file']);`