From 0a615dd41402a0653cfc40110a1fc0846da8c0f1 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 21 Nov 2016 13:40:18 -0800 Subject: [PATCH] Include getPublicLogMessage() in double-exception messages Change-Id: I364e237f859d65fdcc29025c63c90ac2e0b96718 --- includes/exception/MWExceptionRenderer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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"; -- 2.20.1