| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -1598,7 +1598,7 @@ |
| 1599 | 1599 | } |
| 1600 | 1600 | ?> |
| 1601 | 1601 | <ul class='plain'><?php |
| 1602 | | - database_picker($conf); |
| | 1602 | + database_picker($ourdb, $conf); |
| 1603 | 1603 | ?></ul> |
| 1604 | 1604 | </div> |
| 1605 | 1605 | |
| — | — | @@ -1639,7 +1639,7 @@ |
| 1640 | 1640 | </p> |
| 1641 | 1641 | </div> |
| 1642 | 1642 | |
| 1643 | | - <?php database_switcher('mysql'); ?> |
| | 1643 | + <?php database_switcher($ourdb, 'mysql'); ?> |
| 1644 | 1644 | <div class="config-input"><?php aField( $conf, "DBprefix", "Database table prefix:" ); ?></div> |
| 1645 | 1645 | <div class="config-desc"> |
| 1646 | 1646 | <p>If you need to share one database between multiple wikis, or |
| — | — | @@ -1678,7 +1678,7 @@ |
| 1679 | 1679 | </p> |
| 1680 | 1680 | </fieldset> |
| 1681 | 1681 | |
| 1682 | | - <?php database_switcher('postgres'); ?> |
| | 1682 | + <?php database_switcher($ourdb, 'postgres'); ?> |
| 1683 | 1683 | <div class="config-input"><?php aField( $conf, "DBport", "Database port:" ); ?></div> |
| 1684 | 1684 | <div class="config-input"><?php aField( $conf, "DBpgschema", "Schema for mediawiki:" ); ?></div> |
| 1685 | 1685 | <div class="config-input"><?php aField( $conf, "DBts2schema", "Schema for tsearch2:" ); ?></div> |
| — | — | @@ -1689,7 +1689,7 @@ |
| 1690 | 1690 | </div> |
| 1691 | 1691 | </fieldset> |
| 1692 | 1692 | |
| 1693 | | - <?php database_switcher('sqlite'); ?> |
| | 1693 | + <?php database_switcher($ourdb, 'sqlite'); ?> |
| 1694 | 1694 | <div class="config-input"><?php |
| 1695 | 1695 | aField( $conf, "SQLiteDataDir", "SQLite data directory:" ); |
| 1696 | 1696 | ?></div> |
| — | — | @@ -1702,14 +1702,14 @@ |
| 1703 | 1703 | </fieldset> |
| 1704 | 1704 | |
| 1705 | 1705 | |
| 1706 | | - <?php database_switcher( 'mssql' ); ?> |
| | 1706 | + <?php database_switcher($ourdb, 'mssql' ); ?> |
| 1707 | 1707 | <div class="config-desc"> |
| 1708 | 1708 | <p>No MS SQL Server specific options at this time.</p> |
| 1709 | 1709 | </div> |
| 1710 | 1710 | </fieldset> |
| 1711 | 1711 | |
| 1712 | 1712 | |
| 1713 | | - <?php database_switcher('ibm_db2'); ?> |
| | 1713 | + <?php database_switcher($ourdb, 'ibm_db2'); ?> |
| 1714 | 1714 | <div class="config-input"><?php |
| 1715 | 1715 | aField( $conf, "DBport_db2", "Database port:" ); |
| 1716 | 1716 | ?></div> |
| — | — | @@ -1728,7 +1728,7 @@ |
| 1729 | 1729 | </div> |
| 1730 | 1730 | </fieldset> |
| 1731 | 1731 | |
| 1732 | | - <?php database_switcher('oracle'); ?> |
| | 1732 | + <?php database_switcher($ourdb, 'oracle'); ?> |
| 1733 | 1733 | <div class="config-input"><?php aField( $conf, "DBprefix_ora", "Database table prefix:" ); ?></div> |
| 1734 | 1734 | <div class="config-desc"> |
| 1735 | 1735 | <p>If you need to share one database between multiple wikis, or |
| — | — | @@ -2218,8 +2218,7 @@ |
| 2219 | 2219 | return $errstr; |
| 2220 | 2220 | } |
| 2221 | 2221 | |
| 2222 | | -function database_picker($conf) { |
| 2223 | | - global $ourdb; |
| | 2222 | +function database_picker($ourdb, $conf) { |
| 2224 | 2223 | print "\n"; |
| 2225 | 2224 | foreach(array_keys($ourdb) as $db) { |
| 2226 | 2225 | if ($ourdb[$db]['havedriver']) { |
| — | — | @@ -2231,8 +2230,7 @@ |
| 2232 | 2231 | print "\n\t"; |
| 2233 | 2232 | } |
| 2234 | 2233 | |
| 2235 | | -function database_switcher($db) { |
| 2236 | | - global $ourdb; |
| | 2234 | +function database_switcher($ourdb, $db) { |
| 2237 | 2235 | $color = $ourdb[$db]['bgcolor']; |
| 2238 | 2236 | $full = $ourdb[$db]['fullname']; |
| 2239 | 2237 | print "<fieldset id='$db' style='clear:both'><legend>$full-specific options</legend>\n"; |