dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dc70a8b)
* (bug 18289) Database connection error page now returns correct HTML
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Thu, 2 Apr 2009 20:38:25 +0000 (20:38 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Thu, 2 Apr 2009 20:38:25 +0000 (20:38 +0000)
Changed MWException::htmlHeader() and MWException::htmlFooter() to return the HTML rather than echo()'ing directly

RELEASE-NOTES patch | blob | history
includes/Exception.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ccb608a..437e3d9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -317,6 +317,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18291) rebuildrecentchanges.php failed to add deletion log entries
 * (bug 18304) rebuildrecentchanges.php got size changes wrong
 * (bug 18170) Fixed a PHP warning in Parser::preSaveTransform() in PHP 5.3
+* (bug 18289) Database connection error page now returns correct HTML
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/Exception.php b/includes/Exception.php
index 5f808b2..dc5b72d 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -202,7 +202,7 @@ class MWException extends Exception {
                        header( 'Pragma: nocache' );
                }
                $title = $this->getPageTitle();
-               echo "<html>
+               return "<html>
                <head>
                <title>$title</title>
                </head>
@@ -215,7 +215,7 @@ class MWException extends Exception {
         * print the end of the html page if not using $wgOut.
         */
        function htmlFooter() {
-               echo "</body></html>";
+               return "</body></html>";
        }
        
        /**
@@ -297,7 +297,7 @@ function wfReportException( Exception $e ) {
                                wfPrintError( $message );
                        } else {
                                echo nl2br( htmlspecialchars( $message ) ). "\n";
-                               }
+                       }
                }
        } else {
                $message = "Unexpected non-MediaWiki exception encountered, of type \"" . get_class( $e ) . "\"\n" .
@@ -322,8 +322,7 @@ function wfPrintError( $message ) {
        #      Try to produce meaningful output anyway. Using echo may corrupt output to STDOUT though.
        if ( defined( 'STDERR' ) ) {
                fwrite( STDERR, $message );
-       }
-       else {
+       } else {
                echo( $message );
        }
 }
Wiklou, le Wiki du Wiklou