From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 21 Mar 2010 14:50:22 +0000 (+0000)
Subject: Directly grab the default installer values from DefaultSettings, so they stay in... 
X-Git-Tag: 1.31.0-rc.0~37397
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=eab8cd548506430706123cfe5e54d43d3949a3cd;p=lhc%2Fweb%2Fwiklou.git

Directly grab the default installer values from DefaultSettings, so they stay in sync.
---

diff --git a/config/Installer.php b/config/Installer.php
index c4e2a4c164..fb76ef9cb6 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -613,9 +613,9 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 		$conf->DBtype = $DefaultDBtype;
 	}
 
-	$conf->DBserver = importPost( "DBserver", "localhost" );
-	$conf->DBname = importPost( "DBname", "wikidb" );
-	$conf->DBuser = importPost( "DBuser", "wikiuser" );
+	$conf->DBserver = importPost( "DBserver", $wgDBserver );
+	$conf->DBname = importPost( "DBname", $wgDBname );
+	$conf->DBuser = importPost( "DBuser", $wgDBuser );
 	$conf->DBpassword = importPost( "DBpassword" );
 	$conf->DBpassword2 = importPost( "DBpassword2" );
 	$conf->SysopName = importPost( "SysopName", "WikiSysop" );
@@ -632,7 +632,7 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 		importPost( "DBengine", "InnoDB" ) );
 
 	## Postgres specific:
-	$conf->DBport      = importPost( "DBport",      "5432" );
+	$conf->DBport      = importPost( "DBport",      $wgDBport );
 	$conf->DBts2schema = importPost( "DBts2schema", "public" );
 	$conf->DBpgschema  = importPost( "DBpgschema",  "mediawiki" );