From 3b42f4297e1ab3eff66f05409f8c74ad37d9f13d Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Tue, 21 Nov 2006 18:20:02 +0000
Subject: 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
---
 phpBB/includes/functions.php | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'phpBB/includes/functions.php')

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:
-- 
cgit v1.2.1