diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-21 18:20:02 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-21 18:20:02 +0000 |
| commit | 3b42f4297e1ab3eff66f05409f8c74ad37d9f13d (patch) | |
| tree | e7308c966499609b5f232a39a71cc222432c1e26 | |
| parent | ab9ec8064acb25d09d6d0edb93ecbe3b59541010 (diff) | |
| download | forums-3b42f4297e1ab3eff66f05409f8c74ad37d9f13d.tar forums-3b42f4297e1ab3eff66f05409f8c74ad37d9f13d.tar.gz forums-3b42f4297e1ab3eff66f05409f8c74ad37d9f13d.tar.bz2 forums-3b42f4297e1ab3eff66f05409f8c74ad37d9f13d.tar.xz forums-3b42f4297e1ab3eff66f05409f8c74ad37d9f13d.zip | |
decrease the barrier for E_ALL error reporting and email traces from DEBUG_EXTRA to DEBUG
git-svn-id: file:///svn/phpbb/trunk@6629 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 19 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
3 files changed, 10 insertions, 13 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 4ebcec38d5..dac39e5940 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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: diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 75eda9b10c..51553ec296 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -962,7 +962,7 @@ class smtp_class function smtp_class() { - if (defined('DEBUG_EXTRA')) + if (defined('DEBUG')) { $this->backtrace = true; $this->backtrace_log = array(); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index a78ed995af..472b79cfa7 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -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 ... |