From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 12 Oct 2018 04:05:16 +0000 (+0100)
Subject: exception: Correct label "Notice" for E_USER_NOTICE, not "Warning"
X-Git-Tag: 1.34.0-rc.0~3785^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=1f92231f815c8c4ae03b97a0218b20f9e9cb2b7a;p=lhc%2Fweb%2Fwiklou.git

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
---

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;