From f699e1d5e022e54fc03a07e3f583592e673b9592 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 17 Feb 2009 21:14:34 +0000 Subject: [PATCH] Fix spacing properly this time. --- includes/Exception.php | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/includes/Exception.php b/includes/Exception.php index 2ccdcc9e1a..199011ddda 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -273,37 +273,37 @@ function wfInstallExceptionHandler() { function wfReportException( Exception $e ) { $cmdLine = MWException::isCommandLine(); if ( $e instanceof MWException ) { - try { - $e->report(); - } catch ( Exception $e2 ) { - // Exception occurred from within exception handler - // Show a simpler error message for the original exception, - // don't try to invoke report() - $message = "MediaWiki internal error.\n\n"; - if ( $GLOBALS['wgShowExceptionDetails'] ) - $message .= "Original exception: " . $e->__toString(); - $message .= "\n\nException caught inside exception handler"; - if ( $GLOBALS['wgShowExceptionDetails'] ) - $message .= ": " . $e2->__toString(); - $message .= "\n"; + try { + $e->report(); + } catch ( Exception $e2 ) { + // Exception occurred from within exception handler + // Show a simpler error message for the original exception, + // don't try to invoke report() + $message = "MediaWiki internal error.\n\n"; + if ( $GLOBALS['wgShowExceptionDetails'] ) + $message .= "Original exception: " . $e->__toString(); + $message .= "\n\nException caught inside exception handler"; + if ( $GLOBALS['wgShowExceptionDetails'] ) + $message .= ": " . $e2->__toString(); + $message .= "\n"; + if ( $cmdLine ) { + wfPrintError( $message ); + } else { + echo nl2br( htmlspecialchars( $message ) ). "\n"; + } + } + } else { + $message = "Unexpected non-MediaWiki exception encountered, of type \"" . get_class( $e ) . "\"\n" . + $e->__toString() . "\n"; + if ( $GLOBALS['wgShowExceptionDetails'] ) { + $message .= "\n" . $e->getTraceAsString() ."\n"; + } if ( $cmdLine ) { wfPrintError( $message ); } else { echo nl2br( htmlspecialchars( $message ) ). "\n"; - } } - } else { - $message = "Unexpected non-MediaWiki exception encountered, of type \"" . get_class( $e ) . "\"\n" . - $e->__toString() . "\n"; - if ( $GLOBALS['wgShowExceptionDetails'] ) { - $message .= "\n" . $e->getTraceAsString() ."\n"; - } - if ( $cmdLine ) { - wfPrintError( $message ); - } else { - echo nl2br( htmlspecialchars( $message ) ). "\n"; - } - } + } } /** -- 2.20.1