diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/installer/MysqlInstaller.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/installer/MysqlInstaller.php')
| -rw-r--r-- | includes/installer/MysqlInstaller.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php index 3af08d60..e5c1a1db 100644 --- a/includes/installer/MysqlInstaller.php +++ b/includes/installer/MysqlInstaller.php @@ -93,9 +93,7 @@ class MysqlInstaller extends DatabaseInstaller { public function submitConnectForm() { // Get variables from the request. - $newValues = $this->setVarsFromRequest( array( - 'wgDBserver', 'wgDBname', 'wgDBprefix', '_InstallUser', '_InstallPassword' - ) ); + $newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBname', 'wgDBprefix' ) ); // Validate them. $status = Status::newGood(); @@ -110,12 +108,6 @@ class MysqlInstaller extends DatabaseInstaller { if ( !preg_match( '/^[a-z0-9_-]*$/i', $newValues['wgDBprefix'] ) ) { $status->fatal( 'config-invalid-db-prefix', $newValues['wgDBprefix'] ); } - if ( !strlen( $newValues['_InstallUser'] ) ) { - $status->fatal( 'config-db-username-empty' ); - } - if ( !strlen( $newValues['_InstallPassword'] ) ) { - $status->fatal( 'config-db-password-empty', $newValues['_InstallUser'] ); - } if ( !$status->isOK() ) { return $status; } |