* changed variable list as per comment on r79954 left only wgDBtype

* all other variables get set trough ->getGlobalNames
* could somone test this on mysql, postgres and sqlite ... it should work, but to be sure

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 4223402..8a95711 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -15,7 +15,7 @@
 class OracleInstaller extends DatabaseInstaller {
 
        protected $globalNames = array(
-               'wgDBport',
+               'wgDBserver',
                'wgDBname',
                'wgDBuser',
                'wgDBpassword',

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 453aa27..0e2b089 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -300,7 +300,7 @@ class WebInstaller_ExistingWiki extends WebInstallerPage {
                }
 
                // Set the relevant variables from LocalSettings.php
-               $requiredVars = array( 'wgDBtype', 'wgDBuser', 'wgDBpassword', 'wgDBname', 'wgDBserver' );
+               $requiredVars = array( 'wgDBtype' );
                $status = $this->importVariables( $requiredVars , $vars );
                $installer = $this->parent->getDBInstaller();
                $status->merge( $this->importVariables( $installer->getGlobalNames(), $vars ) );