diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-09-19 17:15:31 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-09-19 17:37:15 +0200 |
| commit | 7965387201c86a7d56ae8974ca1eaaba68d4e30d (patch) | |
| tree | e89c4484ea5b284d06f426a37d1cb6fcb9cf3304 /phpBB/includes/functions.php | |
| parent | 0df7e5eefa245559d3a1e1c0318fba0011513a9c (diff) | |
| download | forums-7965387201c86a7d56ae8974ca1eaaba68d4e30d.tar forums-7965387201c86a7d56ae8974ca1eaaba68d4e30d.tar.gz forums-7965387201c86a7d56ae8974ca1eaaba68d4e30d.tar.bz2 forums-7965387201c86a7d56ae8974ca1eaaba68d4e30d.tar.xz forums-7965387201c86a7d56ae8974ca1eaaba68d4e30d.zip | |
[ticket/10370] Use single string instead of an array for arguments.
PHPBB3-10370
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5f90093bd0..df5a05f53b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3404,12 +3404,11 @@ function get_backtrace() // Only show function arguments for include etc. // Other parameters may contain sensible information - $args = array(); + $argument = ''; if (!empty($trace['args'][0]) && in_array($trace['function'], array('include', 'require', 'include_once'))) { $argument = htmlspecialchars($trace['args'][0]); $argument = phpbb_filter_root_path($argument); - $args[] = "'{$argument}'"; } $trace['class'] = (!isset($trace['class'])) ? '' : $trace['class']; @@ -3419,7 +3418,8 @@ function get_backtrace() $output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />'; $output .= '<b>LINE:</b> ' . ((!empty($trace['line'])) ? $trace['line'] : '') . '<br />'; - $output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']) . '(' . ((sizeof($args)) ? implode(', ', $args) : '') . ')<br />'; + $output .= '<b>CALL:</b> ' . htmlspecialchars($trace['class'] . $trace['type'] . $trace['function']); + $output .= '(' . (($argument !== '') ? "'$argument'" : '') . ')<br />'; } $output .= '</div>'; return $output; |