jenkins-bot has submitted this change and it was merged.
Change subject: MWExceptionHandler: Restore delegation to MWException::report
......................................................................
MWExceptionHandler: Restore delegation to MWException::report
Follow up to 00bee0297. Many MWException subclasses override
MWException::report to do things like special logging and setting the
HTTP response status code. We need to keep calling those methods until
MWExceptionRenderer knows how to handle all of them.
Bug: T147098
Change-Id: I2c90e2d9e9b019357458c7e14a3d602b591c6f5b
---
M includes/exception/MWExceptionHandler.php
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/exception/MWExceptionHandler.php
b/includes/exception/MWExceptionHandler.php
index 8359846..797b3af 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -62,7 +62,15 @@
protected static function report( $e ) {
try {
// Try and show the exception prettily, with the normal
skin infrastructure
- MWExceptionRenderer::output( $e,
MWExceptionRenderer::AS_PRETTY );
+ if ( $e instanceof MWException ) {
+ // Delegate to MWException until all subclasses
are handled by
+ // MWExceptionRenderer and
MWException::report() has been
+ // removed.
+ $e->report();
+ } else {
+ MWExceptionRenderer::output(
+ $e, MWExceptionRenderer::AS_PRETTY );
+ }
} catch ( Exception $e2 ) {
// Exception occurred from within exception handler
// Show a simpler message for the original exception,
--
To view, visit https://gerrit.wikimedia.org/r/313626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c90e2d9e9b019357458c7e14a3d602b591c6f5b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
