From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 21 Nov 2016 21:40:18 +0000 (-0800)
Subject: Include getPublicLogMessage() in double-exception messages
X-Git-Tag: 1.31.0-rc.0~4798^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0a615dd41402a0653cfc40110a1fc0846da8c0f1;p=lhc%2Fweb%2Fwiklou.git

Include getPublicLogMessage() in double-exception messages

Change-Id: I364e237f859d65fdcc29025c63c90ac2e0b96718
---

diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index c0f1e84404..b600f4203a 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -60,7 +60,9 @@ class MWExceptionRenderer {
 							MWExceptionHandler::getLogMessage( $eNew ) .
 						"\nBacktrace:\n" . MWExceptionHandler::getRedactedTraceAsString( $eNew );
 				} else {
-					$message .= "Exception caught inside exception handler.\n\n" .
+					$message .= 'Original exception: ' .
+						MWExceptionHandler::getPublicLogMessage( $e );
+					$message .= "\n\nException caught inside exception handler.\n\n" .
 						self::getShowBacktraceError( $e );
 				}
 				$message .= "\n";