makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-27 04:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10369] Rename filter_errfile() to filter_root_path().

Browse source 
PHPBB3-10369
This commit is contained in:
Andreas Fischer 2011-09-18 22:32:25 +02:00
parent 9006984d5a
commit 1ad97424a4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/error_collector.php
View file

@ -53,7 +53,7 @@ class phpbb_error_collector
list($errno, $msg_text, $errfile, $errline) = $error; list($errno, $msg_text, $errfile, $errline) = $error;
// Prevent leakage of local path to phpBB install // Prevent leakage of local path to phpBB install
$errfile = phpbb_filter_errfile($errfile); $errfile = phpbb_filter_root_path($errfile);
$text .= "Errno $errno: $msg_text at $errfile line $errline"; $text .= "Errno $errno: $msg_text at $errfile line $errline";
} }

6
phpBB/includes/functions.php
View file

@ -3816,8 +3816,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
{ {
$errfile = phpbb_filter_errfile($errfile); $errfile = phpbb_filter_root_path($errfile);
$msg_text = phpbb_filter_errfile($msg_text); $msg_text = phpbb_filter_root_path($msg_text);
$error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice'; $error_name = ($errno === E_WARNING) ? 'PHP Warning' : 'PHP Notice';
echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n"; echo '<b>[phpBB Debug] ' . $error_name . '</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
@ -4004,7 +4004,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
* @return string Relative file path * @return string Relative file path
* (e.g. /includes/functions.php) * (e.g. /includes/functions.php)
*/ */
function phpbb_filter_errfile($errfile) function phpbb_filter_root_path($errfile)
{ {
static $root_path; static $root_path;