X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fexception%2FMWException.php;h=bebd91580f59aad788b5795bd9ebecc49b08a5ee;hb=c42d81ec23a4ecf6e8325a8cd51a46318e323f2d;hp=c0186f9f76aeb833bc096990fc0b91dd04c55bba;hpb=3dd9d431ead4d1877fbaf40a1bc24d57aa7f86ea;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php
index c0186f9f76..bebd91580f 100644
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -70,7 +70,7 @@ class MWException extends Exception {
 	 * @param array $args Arguments to pass to the callback functions
 	 * @return string|null String to output or null if any hook has been called
 	 */
-	public function runHooks( $name, $args = array() ) {
+	public function runHooks( $name, $args = [] ) {
 		global $wgExceptionHooks;
 
 		if ( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) {
@@ -84,7 +84,7 @@ class MWException extends Exception {
 		}
 
 		$hooks = $wgExceptionHooks[$name];
-		$callargs = array_merge( array( $this ), $args );
+		$callargs = array_merge( [ $this ], $args );
 
 		foreach ( $hooks as $hook ) {
 			if (
@@ -141,7 +141,7 @@ class MWException extends Exception {
 			nl2br( htmlspecialchars( MWExceptionHandler::getRedactedTraceAsString( $this ) ) ) .
 			"</p>\n";
 		} else {
-			$logId = MWExceptionHandler::getLogId( $this );
+			$logId = WebRequest::getRequestId();
 			$type = get_class( $this );
 			return "<div class=\"errorbox\">" .
 			'[' . $logId . '] ' .