http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72171
Revision: 72171
Author: leonsp
Date: 2010-09-01 22:37:19 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Reverting some of r72166 and fixing the $wgDBport collision between Postgres
and DB2 in a different way.
Modified Paths:
--------------
trunk/phase3/config/Installer.php
Modified: trunk/phase3/config/Installer.php
===================================================================
--- trunk/phase3/config/Installer.php 2010-09-01 22:33:03 UTC (rev 72170)
+++ trunk/phase3/config/Installer.php 2010-09-01 22:37:19 UTC (rev 72171)
@@ -644,6 +644,7 @@
$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 @@
}
## DB2 specific:
+ if ( $conf->DBtype == 'ibm_db2' ) {
+ $wgDBport = $conf->DBport_db2;
+ }
$wgCommandLineMode = true;
if (! defined ( 'STDERR' ) )
@@ -1707,7 +1711,7 @@
<?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 @@
"# 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
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
