Added/Removed spaces around string concatenation

[lhc/web/wiklou.git] / includes / Exception.php
diff --git a/includes/Exception.php b/includes/Exception.php

index 7d9f63d..93fddac 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -247,7 +247,7 @@ class MWException extends Exception {
          * It will be either HTML or plain text based on isCommandLine().
          */
         function report() {
-               global $wgLogExceptionBacktrace;
+               global $wgLogExceptionBacktrace, $wgMimeType;
                 $log = $this->getLogMessage();
  
                 if ( $log ) {
@@ -267,6 +267,7 @@ class MWException extends Exception {
                 } else {
                         header( "HTTP/1.1 500 MediaWiki exception" );
                         header( "Status: 500 MediaWiki exception", true );
+                       header( "Content-Type: $wgMimeType; charset=utf-8", true );
  
                         $this->reportHTML();
                 }
@@ -328,11 +329,17 @@ class ErrorPageError extends MWException {
                 $this->msg = $msg;
                 $this->params = $params;
  
+               // Bug 44111: Messages in the log files should be in English and not
+               // customized by the local wiki. So get the default English version for
+               // passing to the parent constructor. Our overridden report() below
+               // makes sure that the page shown to the user is not forced to English.
                 if( $msg instanceof Message ) {
-                       parent::__construct( $msg );
+                       $enMsg = clone( $msg );
                 } else {
-                       parent::__construct( wfMessage( $msg )->text() );
+                       $enMsg = wfMessage( $msg, $params );
                 }
+               $enMsg->inLanguage( 'en' )->useDatabase( false );
+               parent::__construct( $enMsg->text() );
         }
  
         function report() {
@@ -610,7 +617,7 @@ class HttpError extends MWException {
                         $content = htmlspecialchars( $this->content );
                 }
  
-               return "<!DOCTYPE html>\n".
+               return "<!DOCTYPE html>\n" .
                         "<html><head><title>$header</title></head>\n" .
                         "<body><h1>$header</h1><p>$content</p></body></html>\n";
         }
@@ -714,8 +721,10 @@ class MWExceptionHandler {
                 // Final cleanup
                 if ( $wgFullyInitialised ) {
                         try {
-                               wfLogProfilingData(); // uses $wgRequest, hence the $wgFullyInitialised condition
-                       } catch ( Exception $e ) {}
+                               // uses $wgRequest, hence the $wgFullyInitialised condition
+                               wfLogProfilingData();
+                       } catch ( Exception $e ) {
+                       }
                 }
  
                 // Exit value should be nonzero for the benefit of shell jobs