diff options
| author |   Nils Adermann <naderman@naderman.de> | 2011-06-20 00:36:05 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-20 00:36:05 +0200 |
| commit | bf39d6abdc79179e5faedf6cae131425ff42510b (patch) | |
| tree | cfe79e65cdbb556e8e4939b750155f83e013ea52 /phpBB/includes/functions.php | |
| parent | Merge branch 'develop-olympus' into develop (diff) | |
| parent | Merge branch 'prep-release-3.0.9' into develop-olympus (diff) | |
| download | phpbb-bf39d6abdc79179e5faedf6cae131425ff42510b.tar.gz phpbb-bf39d6abdc79179e5faedf6cae131425ff42510b.tar.bz2 phpbb-bf39d6abdc79179e5faedf6cae131425ff42510b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10234] Report E_WARNING errors as "PHP Warning" instead of "PHP Notice"
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 8210a4f2e9..932b75d3ac 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3714,7 +3714,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')) |