From be8ce87825ae5d415fee2a1ee992184ed2f44a90 Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Fri, 14 Jan 2011 07:05:21 +0000 Subject: [PATCH] * 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 --- includes/installer/OracleInstaller.php | 2 +- includes/installer/WebInstallerPage.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 4223402e28..8a957110aa 100644 --- 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 453aa27b42..0e2b08954d 100644 --- 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 ) ); -- 2.20.1