X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fexception%2FMWExceptionHandler.php;h=d653dd0afb0068d4124a296175bc7ace6a5e20cb;hb=54c1e18eec6985ec72ca89142b27b9f6b9ac7eb2;hp=573490222f7f1354c55486a7300d20c6d1710879;hpb=91d69e12e1d2e00953cae3c153e37f3d36e5903c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index 573490222f..d653dd0afb 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -143,7 +143,7 @@ class MWExceptionHandler {
 				self::getLogMessage( $e ),
 				self::getLogContext( $e )
 			);
-			$factory->rollbackMasterChanges();
+			$factory->rollbackMasterChanges( __METHOD__ );
 		}
 	}
 
@@ -197,6 +197,7 @@ class MWExceptionHandler {
 	 * @param string $message
 	 * @param string $file
 	 * @param int $line
+	 * @return bool
 	 *
 	 * @see logError()
 	 */
@@ -245,7 +246,6 @@ class MWExceptionHandler {
 		return false;
 	}
 
-
 	/**
 	 * Dual purpose callback used as both a set_error_handler() callback and
 	 * a registered shutdown function. Receive a callback from the interpreter
@@ -369,6 +369,7 @@ TXT;
 	public static function prettyPrintTrace( array $trace, $pad = '' ) {
 		$text = '';
 
+		$level = 0;
 		foreach ( $trace as $level => $frame ) {
 			if ( isset( $frame['file'] ) && isset( $frame['line'] ) ) {
 				$text .= "{$pad}#{$level} {$frame['file']}({$frame['line']}): ";