| Index: trunk/phase3/includes/installer/MysqlInstaller.php |
| — | — | @@ -430,8 +430,8 @@ |
| 431 | 431 | return $status; |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | | - $db = $this->getVar( 'wgDBname' ); |
| 435 | 434 | $this->db->selectDB( $db ); |
| | 435 | + $this->setupSchemaVars(); |
| 436 | 436 | $error = $this->db->sourceFile( "$IP/maintenance/users.sql" ); |
| 437 | 437 | if ( $error !== true ) { |
| 438 | 438 | $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error ); |
| — | — | @@ -463,6 +463,9 @@ |
| 464 | 464 | public function getSchemaVars() { |
| 465 | 465 | return array( |
| 466 | 466 | 'wgDBTableOptions' => $this->getTableOptions(), |
| | 467 | + 'wgDBname' => $this->getVar( 'wgDBname' ), |
| | 468 | + 'wgDBuser' => $this->getVar( 'wgDBuser' ), |
| | 469 | + 'wgDBpassword' => $this->getVar( 'wgDBpassword' ), |
| 467 | 470 | ); |
| 468 | 471 | } |
| 469 | 472 | |