From 1f92231f815c8c4ae03b97a0218b20f9e9cb2b7a Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 12 Oct 2018 05:05:16 +0100 Subject: [PATCH] exception: Correct label "Notice" for E_USER_NOTICE, not "Warning" Follows-up ef06b528d9, which fixed the severity of all PHP errors to have severity "Warning" or higher. However, it also accidentally changed the label of "Notice" to "Warning", which is confusing and incorrect. Change-Id: Iffd39aa23b7f2cbff5cdaf876b8d4d595dcd6f96 --- includes/exception/MWExceptionHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php index 0e81a43bab..951498e537 100644 --- a/includes/exception/MWExceptionHandler.php +++ b/includes/exception/MWExceptionHandler.php @@ -225,8 +225,12 @@ class MWExceptionHandler { $levelName = 'Notice'; $severity = LogLevel::ERROR; break; - case E_USER_WARNING: case E_USER_NOTICE: + // Used by wfWarn(), MWDebug::warning() + $levelName = 'Notice'; + $severity = LogLevel::WARNING; + break; + case E_USER_WARNING: // Used by wfWarn(), MWDebug::warning() $levelName = 'Warning'; $severity = LogLevel::WARNING; -- 2.20.1