Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug 18289) Database connection error page now returns correct HTML

Browse source 
Changed MWException::htmlHeader() and MWException::htmlFooter() to return the HTML rather than echo()'ing directly
This commit is contained in:
Alexandre Emsenhuber 2009-04-02 20:38:25 +00:00
parent dc70a8b270
commit 7248906455
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
RELEASE-NOTES
View file

@ -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

9
includes/Exception.php
View file

@ -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 );
}
}