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/PostgresInstaller.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/installer/PostgresInstaller.php')
| -rw-r--r-- | includes/installer/PostgresInstaller.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index b18fe944..cb40f884 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -83,10 +83,7 @@ class PostgresInstaller extends DatabaseInstaller { function submitConnectForm() { // Get variables from the request - $newValues = $this->setVarsFromRequest( array( - 'wgDBserver', 'wgDBport', 'wgDBname', 'wgDBmwschema', - '_InstallUser', '_InstallPassword' - ) ); + $newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBport', 'wgDBname', 'wgDBmwschema' ) ); // Validate them $status = Status::newGood(); @@ -98,12 +95,6 @@ class PostgresInstaller extends DatabaseInstaller { if ( !preg_match( '/^[a-zA-Z0-9_]*$/', $newValues['wgDBmwschema'] ) ) { $status->fatal( 'config-invalid-schema', $newValues['wgDBmwschema'] ); } - if ( !strlen( $newValues['_InstallUser'] ) ) { - $status->fatal( 'config-db-username-empty' ); - } - if ( !strlen( $newValues['_InstallPassword'] ) ) { - $status->fatal( 'config-db-password-empty', $newValues['_InstallUser'] ); - } // Submit user box if ( $status->isOK() ) { |