diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-20 00:35:17 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-20 00:35:17 +0200 |
| commit | fd7e29131ecf437823f625e60e8bbcc0ddb0de40 (patch) | |
| tree | 8b1f6a8158e28e94adecbbcb62e5d707dbdc3c09 /phpBB/includes | |
| parent | e0ecd3e11835ae053e9cb8a10f25c28f881f74e9 (diff) | |
| parent | b7069f395b53df09a5828238422b0d1a34e0ed08 (diff) | |
| download | forums-fd7e29131ecf437823f625e60e8bbcc0ddb0de40.tar forums-fd7e29131ecf437823f625e60e8bbcc0ddb0de40.tar.gz forums-fd7e29131ecf437823f625e60e8bbcc0ddb0de40.tar.bz2 forums-fd7e29131ecf437823f625e60e8bbcc0ddb0de40.tar.xz forums-fd7e29131ecf437823f625e60e8bbcc0ddb0de40.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b8d9e0b92e..a89b47b170 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3776,7 +3776,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) // 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"; + $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"; // we are writing an image - the user won't see the debug, so let's place it in the log if (defined('IMAGE_OUTPUT') || defined('IN_CRON')) |