| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -644,6 +644,7 @@ |
| 645 | 645 | $conf->SQLiteDataDir = importPost( "SQLiteDataDir", "$IP/../data" ); |
| 646 | 646 | |
| 647 | 647 | ## DB2 specific: |
| | 648 | + $conf->DBport_db2 = importPost( "DBport_db2", "50000" ); |
| 648 | 649 | $conf->DBdb2schema = importPost( "DBdb2schema", "mediawiki" ); |
| 649 | 650 | |
| 650 | 651 | // Oracle specific |
| — | — | @@ -834,6 +835,9 @@ |
| 835 | 836 | } |
| 836 | 837 | |
| 837 | 838 | ## DB2 specific: |
| | 839 | + if ( $conf->DBtype == 'ibm_db2' ) { |
| | 840 | + $wgDBport = $conf->DBport_db2; |
| | 841 | + } |
| 838 | 842 | |
| 839 | 843 | $wgCommandLineMode = true; |
| 840 | 844 | if (! defined ( 'STDERR' ) ) |
| — | — | @@ -1707,7 +1711,7 @@ |
| 1708 | 1712 | |
| 1709 | 1713 | <?php database_switcher($ourdb, 'ibm_db2'); ?> |
| 1710 | 1714 | <div class="config-input"><?php |
| 1711 | | - aField( $conf, "DBport", "Database port:" ); |
| | 1715 | + aField( $conf, "DBport_db2", "Database port:" ); |
| 1712 | 1716 | ?></div> |
| 1713 | 1717 | <div class="config-desc"> |
| 1714 | 1718 | <p>50000 is the usual DB2 port.</p> |
| — | — | @@ -1905,10 +1909,11 @@ |
| 1906 | 1910 | "# SQLite-specific settings |
| 1907 | 1911 | \$wgSQLiteDataDir = \"{$sqliteDataDir}\";"; |
| 1908 | 1912 | } elseif( $conf->DBtype == 'ibm_db2' ) { |
| 1909 | | - $dbsettings = |
| 1910 | | -"# DB2 specific settings |
| 1911 | | -\$wgDBport = \"{$slconf['DBport']}\"; |
| 1912 | | -\$wgDBmwschema = \"{$slconf['DBdb2schema']}\";"; |
| | 1913 | + $dbsettings = <<<MULTILINE |
| | 1914 | +# DB2 specific settings |
| | 1915 | +\$wgDBport = "{$slconf['DBport_db2']}"; |
| | 1916 | +\$wgDBmwschema = "{$slconf['DBdb2schema']}"; |
| | 1917 | +MULTILINE; |
| 1913 | 1918 | } elseif( $conf->DBtype == 'oracle' ) { |
| 1914 | 1919 | $dbsettings = |
| 1915 | 1920 | "# Oracle specific settings |