dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
057b870
)
Include getPublicLogMessage() in double-exception messages
author
Aaron Schulz
<aschulz@wikimedia.org>
Mon, 21 Nov 2016 21:40:18 +0000
(13:40 -0800)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 22 Nov 2016 06:18:53 +0000
(22:18 -0800)
Change-Id: I364e237f859d65fdcc29025c63c90ac2e0b96718
includes/exception/MWExceptionRenderer.php
patch
|
blob
|
history
diff --git
a/includes/exception/MWExceptionRenderer.php
b/includes/exception/MWExceptionRenderer.php
index
c0f1e84
..
b600f42
100644
(file)
--- 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";