| Index: trunk/phase3/includes/db/DatabaseError.php |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | # We can't, cough and die in the usual fashion |
| 180 | | - return parent::reportHTML(); |
| | 180 | + parent::reportHTML(); |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | /** |
| — | — | @@ -198,7 +198,7 @@ |
| 199 | 199 | <div style="margin: 1.5em">$usegoogle<br /> |
| 200 | 200 | <small>$outofdate</small></div> |
| 201 | 201 | <!-- SiteSearch Google --> |
| 202 | | -<form method="get" action="http://www.google.com/search" id="googlesearch"> |
| | 202 | +<form method="get" action="//www.google.com/search" id="googlesearch"> |
| 203 | 203 | <input type="hidden" name="domains" value="$server" /> |
| 204 | 204 | <input type="hidden" name="num" value="50" /> |
| 205 | 205 | <input type="hidden" name="ie" value="UTF-8" /> |
| — | — | @@ -223,7 +223,7 @@ |
| 224 | 224 | global $wgTitle, $wgOut, $wgRequest; |
| 225 | 225 | |
| 226 | 226 | if ( $wgOut->isDisabled() ) { |
| 227 | | - return; // Done already? |
| | 227 | + return ''; // Done already? |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | if ( $wgTitle ) { // use $wgTitle if we managed to set it |
| — | — | @@ -255,7 +255,7 @@ |
| 256 | 256 | public $error, $errno, $sql, $fname; |
| 257 | 257 | |
| 258 | 258 | function __construct( DatabaseBase &$db, $error, $errno, $sql, $fname ) { |
| 259 | | - $message = "A database error has occurred. Did you forget to run maintenance/update.php after upgrading? See: http://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . |
| | 259 | + $message = "A database error has occurred. Did you forget to run maintenance/update.php after upgrading? See: //www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . |
| 260 | 260 | "Query: $sql\n" . |
| 261 | 261 | "Function: $fname\n" . |
| 262 | 262 | "Error: $errno $error\n"; |