makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10370] Use phpbb_filter_root_path() in get_backtrace().

Browse source 
PHPBB3-10370
This commit is contained in:
Andreas Fischer 2011-09-19 16:57:09 +02:00
parent 410028eecf
commit 9c0f75fd65
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions.php
View file

@ -3391,11 +3391,8 @@ function add_log()
*/ */
function get_backtrace() function get_backtrace()
{ {
global $phpbb_root_path;
$output = '<div style="font-family: monospace;">'; $output = '<div style="font-family: monospace;">';
$backtrace = debug_backtrace(); $backtrace = debug_backtrace();
$path = phpbb_realpath($phpbb_root_path);
foreach ($backtrace as $number => $trace) foreach ($backtrace as $number => $trace)
{ {
@ -3406,15 +3403,7 @@ function get_backtrace()
} }
// Strip the current directory from path // Strip the current directory from path
if (empty($trace['file'])) $trace['file'] = (empty($trace['file'])) ? '' : phpbb_filter_root_path($trace['file']);
{
$trace['file'] = '';
}
else
{
$trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']);
$trace['file'] = substr($trace['file'], 1);
}
$args = array(); $args = array();
// If include/require/include_once is not called, do not show arguments - they may contain sensible information // If include/require/include_once is not called, do not show arguments - they may contain sensible information
@ -3428,8 +3417,7 @@ function get_backtrace()
if (!empty($trace['args'][0])) if (!empty($trace['args'][0]))
{ {
$argument = htmlspecialchars($trace['args'][0]); $argument = htmlspecialchars($trace['args'][0]);
$argument = str_replace(array($path, '\\'), array('', '/'), $argument); $argument = phpbb_filter_root_path($argument);
$argument = substr($argument, 1);
$args[] = "'{$argument}'"; $args[] = "'{$argument}'";
} }
} }