diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-20 00:33:38 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-20 00:33:38 +0200 |
| commit | b7069f395b53df09a5828238422b0d1a34e0ed08 (patch) | |
| tree | c8728738f9fd0d8e1753f5aebf5264221725fa45 /phpBB | |
| parent | d5c2bbf62070224fe040d75684574fb10409ac53 (diff) | |
| parent | 8c01ed578da2a501b9ad1fc8541e3eb237d1b765 (diff) | |
| download | forums-b7069f395b53df09a5828238422b0d1a34e0ed08.tar forums-b7069f395b53df09a5828238422b0d1a34e0ed08.tar.gz forums-b7069f395b53df09a5828238422b0d1a34e0ed08.tar.bz2 forums-b7069f395b53df09a5828238422b0d1a34e0ed08.tar.xz forums-b7069f395b53df09a5828238422b0d1a34e0ed08.zip | |
Merge branch 'ticket/bantu/10234' into prep-release-3.0.9
* ticket/bantu/10234:
[ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
Diffstat (limited to 'phpBB')
| -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')) |