X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fexception%2FMWExceptionRenderer.php;h=88b28df385df0cd30a39875664cb0db91e77e3f3;hb=5e421703a2adaef3c4b6f0f92e89cdde63753cd2;hp=b22e87bf4a318574b5a8ad9d548b503b11fb0ec9;hpb=d982dff6257fc79243962636937bc0d067524cd8;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index b22e87bf4a..88b28df385 100644
--- 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 ) ) {
@@ -90,7 +92,7 @@ class MWExceptionRenderer {
private static function useOutputPage( $e ) {
// Can the extension use the Message class/wfMessage to get i18n-ed messages?
foreach ( $e->getTrace() as $frame ) {
- if ( isset( $frame['class'] ) && $frame['class'] === 'LocalisationCache' ) {
+ if ( isset( $frame['class'] ) && $frame['class'] === LocalisationCache::class ) {
return false;
}
}
@@ -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 = "$sorry
$again
$info
";
+ $html = "\n" .
+ '' .
+ '' .
+ htmlspecialchars( $wgSitename ) .
+ '' .
+ '' .
+ "$sorry
$again
$info
";
if ( $wgShowDBErrorBacktrace ) {
$html .= 'Backtrace:
' .
@@ -327,7 +334,7 @@ class MWExceptionRenderer {
$html .= '
';
$html .= self::googleSearchForm();
-
+ $html .= '';
echo $html;
}