http://www.mediawiki.org/wiki/Special:Code/MediaWiki/63998

Revision: 63998
Author:   platonides
Date:     2010-03-21 14:50:22 +0000 (Sun, 21 Mar 2010)

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

Modified Paths:
--------------
    trunk/phase3/config/Installer.php

Modified: trunk/phase3/config/Installer.php
===================================================================
--- trunk/phase3/config/Installer.php   2010-03-21 14:18:54 UTC (rev 63997)
+++ trunk/phase3/config/Installer.php   2010-03-21 14:50:22 UTC (rev 63998)
@@ -613,9 +613,9 @@
                $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 @@
                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" );
 



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to