diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-07 16:55:20 +0000 |
| commit | d1e839625ee9b0ca796f83ff55404af4c6307561 (patch) | |
| tree | 6f9f4ec262aa908150d261e51f862874b7fbfeca /phpBB/includes/functions.php | |
| parent | 4eac4b268b98ec65b7432685de147d76618e479d (diff) | |
| download | forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.gz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.bz2 forums-d1e839625ee9b0ca796f83ff55404af4c6307561.tar.xz forums-d1e839625ee9b0ca796f83ff55404af4c6307561.zip | |
- fix some group specific bugs
- correctly determining terrafrost's birthday mod
git-svn-id: file:///svn/phpbb/trunk@7143 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 24b03fc367..dbe8330c90 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3151,8 +3151,15 @@ function get_backtrace() } // Strip the current directory from path - $trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']); - $trace['file'] = substr($trace['file'], 1); + if (empty($trace['file'])) + { + $trace['file'] = ''; + } + else + { + $trace['file'] = str_replace(array($path, '\\'), array('', '/'), $trace['file']); + $trace['file'] = substr($trace['file'], 1); + } $args = array(); // If include/require/include_once is not called, do not show arguments - they may contain sensible information @@ -3177,7 +3184,7 @@ function get_backtrace() $output .= '<br />'; $output .= '<b>FILE:</b> ' . htmlspecialchars($trace['file']) . '<br />'; - $output .= '<b>LINE:</b> ' . $trace['line'] . '<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 />'; } |