| Index: branches/REL1_17/phase3/includes/installer/MysqlInstaller.php |
| — | — | @@ -419,6 +419,10 @@ |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | public function setupUser() { |
| | 423 | + $dbUser = $this->getVar( 'wgDBuser' ); |
| | 424 | + if( $dbUser == $this->getVar( '_InstallUser' ) ) { |
| | 425 | + return Status::newGood(); |
| | 426 | + } |
| 423 | 427 | $status = $this->getConnection(); |
| 424 | 428 | if ( !$status->isOK() ) { |
| 425 | 429 | return $status; |
| — | — | @@ -428,7 +432,6 @@ |
| 429 | 433 | $dbName = $this->getVar( 'wgDBname' ); |
| 430 | 434 | $this->db->selectDB( $dbName ); |
| 431 | 435 | $server = $this->getVar( 'wgDBserver' ); |
| 432 | | - $dbUser = $this->getVar( 'wgDBuser' ); |
| 433 | 436 | $password = $this->getVar( 'wgDBpassword' ); |
| 434 | 437 | $grantableNames = array(); |
| 435 | 438 | |
| Property changes on: branches/REL1_17/phase3/includes/installer/MysqlInstaller.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 436 | 439 | Merged /branches/sqlite/includes/installer/MysqlInstaller.php:r58211-58321 |
| 437 | 440 | Merged /trunk/phase3/includes/installer/MysqlInstaller.php:r82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,87512 |
| 438 | 441 | Merged /branches/new-installer/phase3/includes/installer/MysqlInstaller.php:r43664-66004 |
| 439 | 442 | Merged /branches/wmf-deployment/includes/installer/MysqlInstaller.php:r53381 |
| 440 | 443 | Merged /branches/REL1_15/phase3/includes/installer/MysqlInstaller.php:r51646 |