| Index: trunk/phase3/includes/Exception.php |
| — | — | @@ -202,7 +202,7 @@ |
| 203 | 203 | header( 'Pragma: nocache' ); |
| 204 | 204 | } |
| 205 | 205 | $title = $this->getPageTitle(); |
| 206 | | - echo "<html> |
| | 206 | + return "<html> |
| 207 | 207 | <head> |
| 208 | 208 | <title>$title</title> |
| 209 | 209 | </head> |
| — | — | @@ -215,7 +215,7 @@ |
| 216 | 216 | * print the end of the html page if not using $wgOut. |
| 217 | 217 | */ |
| 218 | 218 | function htmlFooter() { |
| 219 | | - echo "</body></html>"; |
| | 219 | + return "</body></html>"; |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
| — | — | @@ -297,7 +297,7 @@ |
| 298 | 298 | wfPrintError( $message ); |
| 299 | 299 | } else { |
| 300 | 300 | echo nl2br( htmlspecialchars( $message ) ). "\n"; |
| 301 | | - } |
| | 301 | + } |
| 302 | 302 | } |
| 303 | 303 | } else { |
| 304 | 304 | $message = "Unexpected non-MediaWiki exception encountered, of type \"" . get_class( $e ) . "\"\n" . |
| — | — | @@ -322,8 +322,7 @@ |
| 323 | 323 | # Try to produce meaningful output anyway. Using echo may corrupt output to STDOUT though. |
| 324 | 324 | if ( defined( 'STDERR' ) ) { |
| 325 | 325 | fwrite( STDERR, $message ); |
| 326 | | - } |
| 327 | | - else { |
| | 326 | + } else { |
| 328 | 327 | echo( $message ); |
| 329 | 328 | } |
| 330 | 329 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -317,6 +317,7 @@ |
| 318 | 318 | * (bug 18291) rebuildrecentchanges.php failed to add deletion log entries |
| 319 | 319 | * (bug 18304) rebuildrecentchanges.php got size changes wrong |
| 320 | 320 | * (bug 18170) Fixed a PHP warning in Parser::preSaveTransform() in PHP 5.3 |
| | 321 | +* (bug 18289) Database connection error page now returns correct HTML |
| 321 | 322 | |
| 322 | 323 | == API changes in 1.15 == |
| 323 | 324 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |