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

decrease the barrier for E_ALL error reporting and email traces from DEBUG_EXTRA to DEBUG

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6629 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-21 18:20:02 +00:00
parent ab9ec8064a
commit 3b42f4297e
3 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/includes/functions.php
View file

@ -2901,24 +2901,21 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
// Check the error reporting level and return if the error level does not match
// Additionally do not display notices if we suppress them via @
// If DEBUG_EXTRA is defined the default level is E_ALL
if (($errno & ((defined('DEBUG_EXTRA') && error_reporting()) ? E_ALL : error_reporting())) == 0)
// If DEBUG is defined the default level is E_ALL
if (($errno & ((defined('DEBUG') && error_reporting()) ? E_ALL : error_reporting())) == 0)
{
return;
}
if (defined('DEBUG'))
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
{
if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
{
// remove complete path to installation, with the risk of changing backslashes meant to be there
$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
// remove complete path to installation, with the risk of changing backslashes meant to be there
$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
}
echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
}
break;
case E_USER_ERROR:

2
phpBB/includes/functions_messenger.php
View file

@ -962,7 +962,7 @@ class smtp_class
function smtp_class()
{
if (defined('DEBUG_EXTRA'))
if (defined('DEBUG'))
{
$this->backtrace = true;
$this->backtrace_log = array();

2
phpBB/install/install_install.php
View file

@ -792,7 +792,7 @@ class install_install extends module
$config_data .= "\$load_extensions = '$load_extensions';\n\n";
$config_data .= "@define('PHPBB_INSTALLED', true);\n";
$config_data .= "@define('DEBUG', true);\n"; // @todo Comment out when final
$config_data .= "@define('DEBUG_EXTRA', true);\n"; // @todo Comment out when final
$config_data .= "// @define('DEBUG_EXTRA', true);\n";
$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...