| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -367,6 +367,13 @@ |
| 368 | 368 | } |
| 369 | 369 | } |
| 370 | 370 | $phpError = $this->restoreErrorHandler(); |
| | 371 | + if ( !$this->mConn ) { |
| | 372 | + $error = $this->lastError(); |
| | 373 | + if ( !$error ) { |
| | 374 | + $error = $phpError; |
| | 375 | + } |
| | 376 | + wfLogDBError( "Connection error: $error\n" ); |
| | 377 | + } |
| 371 | 378 | |
| 372 | 379 | wfProfileOut("dbconnect-$server"); |
| 373 | 380 | |
| — | — | @@ -464,7 +471,6 @@ |
| 465 | 472 | } |
| 466 | 473 | } else { |
| 467 | 474 | # New method |
| 468 | | - wfLogDBError( "Connection error: $error\n" ); |
| 469 | 475 | throw new DBConnectionError( $this, $error ); |
| 470 | 476 | } |
| 471 | 477 | } |
| — | — | @@ -2500,7 +2506,6 @@ |
| 2501 | 2507 | } |
| 2502 | 2508 | |
| 2503 | 2509 | $text = str_replace( '$1', $this->error, $noconnect ); |
| 2504 | | - $text .= wfGetSiteNotice(); |
| 2505 | 2510 | |
| 2506 | 2511 | if($wgUseFileCache) { |
| 2507 | 2512 | if($wgTitle) { |