diff options
| author | Nils Adermann <naderman@naderman.de> | 2008-03-24 00:59:39 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2008-03-24 00:59:39 +0000 |
| commit | 5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793 (patch) | |
| tree | 2a107171f756d206b10dd2cc8c85f20d5943a0cd /phpBB | |
| parent | 65b0f6b165f9536ef99f52e5991f59423340d732 (diff) | |
| download | forums-5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793.tar forums-5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793.tar.gz forums-5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793.tar.bz2 forums-5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793.tar.xz forums-5417ec5c4d2e1b7fd1a6b9935a294e7f2af9b793.zip | |
- add error_reporting to style.php (merge from r8464)
- let the error handler deal with E_STRICT (same as E_WARNING/E_NOTICE) and E_RECOVERABLE_ERROR (same as E_USER_ERROR)
git-svn-id: file:///svn/phpbb/trunk@8466 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/common.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 4 | ||||
| -rw-r--r-- | phpBB/style.php | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index b91fd01706..5f4216d1d7 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -21,7 +21,6 @@ $starttime = $starttime[1] + $starttime[0]; // Report all errors, except notices error_reporting(E_ALL ^ E_NOTICE); -//error_reporting(E_ALL | E_STRICT); /* * Remove variables created by register_globals from the global scope diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5005033166..9379284326 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2817,10 +2817,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { case E_NOTICE: case E_WARNING: + case E_STRICT: // Check the error reporting level and return if the error level does not match // If DEBUG is defined the default level is E_ALL - if (($errno & ((defined('DEBUG')) ? E_ALL : error_reporting())) == 0) + if (($errno & ((defined('DEBUG')) ? E_ALL | E_STRICT : error_reporting())) == 0) { return; } @@ -2847,6 +2848,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) break; + case E_RECOVERABLE_ERROR: case E_USER_ERROR: if (!empty($user) && !empty($user->lang)) diff --git a/phpBB/style.php b/phpBB/style.php index 7dfd3886ff..3e923b8f53 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -14,6 +14,10 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); + +// Report all errors, except notices +error_reporting(E_ALL ^ E_NOTICE); + require($phpbb_root_path . 'config.' . $phpEx); if (version_compare(PHP_VERSION, '6.0.0-dev', '<')) |