From: Leons Petrazickis <leonsp@users.mediawiki.org>
Date: Wed, 1 Sep 2010 22:37:19 +0000 (+0000)
Subject: Reverting some of r72166 and fixing the $wgDBport collision between Postgres and... 
X-Git-Tag: 1.31.0-rc.0~35229
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=84164c0ff0c416da1e21c5b206a13e80df2fd525;p=lhc%2Fweb%2Fwiklou.git

Reverting some of r72166 and fixing the $wgDBport collision between Postgres and DB2 in a different way.
---

diff --git a/config/Installer.php b/config/Installer.php
index a421517d5e..20526a16e6 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -644,6 +644,7 @@ print "<li style='font-weight:bold;color:green;font-size:110%'>Environment check
 	$conf->SQLiteDataDir = importPost( "SQLiteDataDir", "$IP/../data" );
 
 	## DB2 specific:
+	$conf->DBport_db2   = importPost( "DBport_db2",      "50000" );
 	$conf->DBdb2schema  = importPost( "DBdb2schema",  "mediawiki" );
 
 	// Oracle specific
@@ -834,6 +835,9 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		}
 
 		## DB2 specific:
+		if ( $conf->DBtype == 'ibm_db2' ) {
+			$wgDBport      = $conf->DBport_db2;
+		}
 
 		$wgCommandLineMode = true;
 		if (! defined ( 'STDERR' ) )
@@ -1707,7 +1711,7 @@ if( count( $errs ) ) {
 	
 	<?php database_switcher($ourdb, 'ibm_db2'); ?>
 	<div class="config-input"><?php
-		aField( $conf, "DBport", "Database port:" );
+		aField( $conf, "DBport_db2", "Database port:" );
 	?></div>
 	<div class="config-desc">
 		<p>50000 is the usual DB2 port.</p>
@@ -1905,10 +1909,11 @@ function writeLocalSettings( $conf ) {
 "# SQLite-specific settings
 \$wgSQLiteDataDir    = \"{$sqliteDataDir}\";";
 	} elseif( $conf->DBtype == 'ibm_db2' ) {
-		$dbsettings =
-"# DB2 specific settings
-\$wgDBport       = \"{$slconf['DBport']}\";
-\$wgDBmwschema       = \"{$slconf['DBdb2schema']}\";";
+		$dbsettings = <<<MULTILINE
+# DB2 specific settings
+\$wgDBport           = "{$slconf['DBport_db2']}";
+\$wgDBmwschema       = "{$slconf['DBdb2schema']}";
+MULTILINE;
 	} elseif( $conf->DBtype == 'oracle' ) {
 		$dbsettings =
 "# Oracle specific settings