dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 437c059)
Readd basic headers and <html>...</html> arround error contents that was removed...
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sun, 7 Aug 2011 12:28:58 +0000 (12:28 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sun, 7 Aug 2011 12:28:58 +0000 (12:28 +0000)
includes/Exception.php patch | blob | history

diff --git a/includes/Exception.php b/includes/Exception.php
index 5a972ca..10a409c 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -182,12 +182,25 @@ class MWException extends Exception {
 
                        $wgOut->output();
                } else {
+                       header( $_SERVER['SERVER_PROTOCOL'] . ' 500 MediaWiki Error', true, 500 );
+                       header( 'Content-type: text/html; charset=UTF-8' );
+                       header( 'Cache-control: none' );
+                       header( 'Pragma: nocache' );
+
                        $hookResult = $this->runHooks( get_class( $this ) . "Raw" );
                        if ( $hookResult ) {
                                die( $hookResult );
                        }
 
+                       echo "<html>
+<head>
+<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
+<title>" . $this->getPageTitle() . "</title>
+</head>
+<body>
+";
                        echo $this->getHTML();
+                       echo "\n</body></html>";
                        die(1);
                }
        }
Wiklou, le Wiki du Wiklou