X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fexception%2FMWExceptionHandler.php;h=6e3fa794ce09b86c50abd1d4b929af746436361a;hb=0a3217462c38624d76bd90e3566ce5c399644767;hp=0e81a43bab7f6c1f1cc4da038fada7d0ca7f820d;hpb=67dc9082463b6023fa1e79cc22cec3ac8589b322;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index 0e81a43bab..6e3fa794ce 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;
@@ -458,22 +462,6 @@ TXT;
 		}, $trace );
 	}
 
-	/**
-	 * Get the ID for this exception.
-	 *
-	 * The ID is saved so that one can match the one output to the user (when
-	 * $wgShowExceptionDetails is set to false), to the entry in the debug log.
-	 *
-	 * @since 1.22
-	 * @deprecated since 1.27: Exception IDs are synonymous with request IDs.
-	 * @param Exception|Throwable $e
-	 * @return string
-	 */
-	public static function getLogId( $e ) {
-		wfDeprecated( __METHOD__, '1.27' );
-		return WebRequest::getRequestId();
-	}
-
 	/**
 	 * If the exception occurred in the course of responding to a request,
 	 * returns the requested URL. Otherwise, returns false.