Merge "exception: Correct label "Notice" for E_USER_NOTICE, not "Warning""

diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index 0e81a43..951498e 100644 (file)
--- 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;