diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
| commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
| tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/installer/PostgresInstaller.php | |
| parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
| parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) | |
Merge branch 'mw-1.26'
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() ) { |