| Index: branches/REL1_17/phase3/includes/installer/MysqlInstaller.php |
| — | — | @@ -419,10 +419,6 @@ |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | public function setupUser() { |
| 423 | | - if ( !$this->getVar( '_CreateDBAccount' ) ) { |
| 424 | | - return Status::newGood(); |
| 425 | | - } |
| 426 | | - |
| 427 | 423 | $status = $this->getConnection(); |
| 428 | 424 | if ( !$status->isOK() ) { |
| 429 | 425 | return $status; |
| — | — | @@ -436,21 +432,26 @@ |
| 437 | 433 | $password = $this->getVar( 'wgDBpassword' ); |
| 438 | 434 | $grantableNames = array(); |
| 439 | 435 | |
| 440 | | - // Before we blindly try to create a user that already has access, |
| 441 | | - try { // first attempt to connect to the database |
| 442 | | - new DatabaseMysql( |
| 443 | | - $server, |
| 444 | | - $dbUser, |
| 445 | | - $password, |
| 446 | | - false, |
| 447 | | - false, |
| 448 | | - 0, |
| 449 | | - $this->getVar( 'wgDBprefix' ) |
| 450 | | - ); |
| | 436 | + if ( $this->getVar( '_CreateDBAccount' ) ) { |
| | 437 | + // Before we blindly try to create a user that already has access, |
| | 438 | + try { // first attempt to connect to the database |
| | 439 | + new DatabaseMysql( |
| | 440 | + $server, |
| | 441 | + $dbUser, |
| | 442 | + $password, |
| | 443 | + false, |
| | 444 | + false, |
| | 445 | + 0, |
| | 446 | + $this->getVar( 'wgDBprefix' ) |
| | 447 | + ); |
| | 448 | + $grantableNames[] = $this->buildFullUserName( $dbUser, $server ); |
| | 449 | + $tryToCreate = false; |
| | 450 | + } catch ( DBConnectionError $e ) { |
| | 451 | + $tryToCreate = true; |
| | 452 | + } |
| | 453 | + } else { |
| 451 | 454 | $grantableNames[] = $this->buildFullUserName( $dbUser, $server ); |
| 452 | 455 | $tryToCreate = false; |
| 453 | | - } catch ( DBConnectionError $e ) { |
| 454 | | - $tryToCreate = true; |
| 455 | 456 | } |
| 456 | 457 | |
| 457 | 458 | if( $tryToCreate ) { |
| Property changes on: branches/REL1_17/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 458 | 459 | Merged /trunk/phase3:r87278 |