MWExceptionRenderer: Fix db error outage page

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

index dc8dfd0..88b28df 100644 (file)
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -47,13 +47,15 @@ class MWExceptionRenderer {
                         self::printError( self::getText( $e ) );
                 } elseif ( $mode === self::AS_PRETTY ) {
                         self::statusHeader( 500 );
+                       self::header( "Content-Type: $wgMimeType; charset=utf-8" );
                         if ( $e instanceof DBConnectionError ) {
                                 self::reportOutageHTML( $e );
                         } else {
-                               self::header( "Content-Type: $wgMimeType; charset=utf-8" );
                                 self::reportHTML( $e );
                         }
                 } else {
+                       self::statusHeader( 500 );
+                       self::header( "Content-Type: $wgMimeType; charset=utf-8" );
                         if ( $eNew ) {
                                 $message = "MediaWiki internal error.\n\n";
                                 if ( self::showBackTrace( $e ) ) {
@@ -292,7 +294,7 @@ class MWExceptionRenderer {
          * @param Exception|Throwable $e
          */
         private static function reportOutageHTML( $e ) {
-               global $wgShowDBErrorBacktrace, $wgShowHostnames, $wgShowSQLErrors;
+               global $wgShowDBErrorBacktrace, $wgShowHostnames, $wgShowSQLErrors, $wgSitename;
  
                 $sorry = htmlspecialchars( self::msg(
                         'dberr-problems',
@@ -317,8 +319,13 @@ class MWExceptionRenderer {
                 }
  
                 MessageCache::singleton()->disable(); // no DB access
-
-               $html = "<h1>$sorry</h1><p>$again</p><p><small>$info</small></p>";
+               $html = "<!DOCTYPE html>\n" .
+                               '<html><head>' .
+                               '<title>' .
+                               htmlspecialchars( $wgSitename ) .
+                               '</title>' .
+                               '<style>body { font-family: sans-serif; margin: 0; padding: 0.5em 2em; }</style>' .
+                               "</head><body><h1>$sorry</h1><p>$again</p><p><small>$info</small></p>";
  
                 if ( $wgShowDBErrorBacktrace ) {
                         $html .= '<p>Backtrace:</p><pre>' .
@@ -327,7 +334,7 @@ class MWExceptionRenderer {
  
                 $html .= '<hr />';
                 $html .= self::googleSearchForm();
-
+               $html .= '</body></html>';
                 echo $html;
         }