Commit local change about not using $ourdb as global.

diff --git a/config/Installer.php b/config/Installer.php
index c90ba44..8c7c0e5 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -1598,7 +1598,7 @@ if( count( $errs ) ) {
        }
 ?>
        <ul class='plain'><?php
-               database_picker($conf);
+               database_picker($ourdb, $conf);
        ?></ul>
        </div>
 
@@ -1639,7 +1639,7 @@ if( count( $errs ) ) {
                </p>
        </div>
 
-       <?php database_switcher('mysql'); ?>
+       <?php database_switcher($ourdb, 'mysql'); ?>
        <div class="config-input"><?php aField( $conf, "DBprefix", "Database table prefix:" ); ?></div>
        <div class="config-desc">
                <p>If you need to share one database between multiple wikis, or
@@ -1678,7 +1678,7 @@ if( count( $errs ) ) {
        </p>
        </fieldset>
 
-       <?php database_switcher('postgres'); ?>
+       <?php database_switcher($ourdb, 'postgres'); ?>
        <div class="config-input"><?php aField( $conf, "DBport", "Database port:" ); ?></div>
        <div class="config-input"><?php aField( $conf, "DBpgschema", "Schema for mediawiki:" ); ?></div>
        <div class="config-input"><?php aField( $conf, "DBts2schema", "Schema for tsearch2:" ); ?></div>
@@ -1689,7 +1689,7 @@ if( count( $errs ) ) {
        </div>
        </fieldset>
 
-       <?php database_switcher('sqlite'); ?>
+       <?php database_switcher($ourdb, 'sqlite'); ?>
        <div class="config-input"><?php
                aField( $conf, "SQLiteDataDir", "SQLite data directory:" );
        ?></div>
@@ -1702,14 +1702,14 @@ if( count( $errs ) ) {
        </fieldset>
 
        
-       <?php database_switcher( 'mssql' ); ?>
+       <?php database_switcher($ourdb, 'mssql' ); ?>
        <div class="config-desc">
                <p>No MS SQL Server specific options at this time.</p>
        </div>
        </fieldset>
        
        
-       <?php database_switcher('ibm_db2'); ?>
+       <?php database_switcher($ourdb, 'ibm_db2'); ?>
        <div class="config-input"><?php
                aField( $conf, "DBport_db2", "Database port:" );
        ?></div>
@@ -1728,7 +1728,7 @@ if( count( $errs ) ) {
        </div>
        </fieldset>
 
-       <?php database_switcher('oracle'); ?>
+       <?php database_switcher($ourdb, 'oracle'); ?>
        <div class="config-input"><?php aField( $conf, "DBprefix_ora", "Database table prefix:" ); ?></div>
        <div class="config-desc">
                <p>If you need to share one database between multiple wikis, or
@@ -2218,8 +2218,7 @@ function testMemcachedServer( $server ) {
        return $errstr;
 }
 
-function database_picker($conf) {
-       global $ourdb;
+function database_picker($ourdb, $conf) {
        print "\n";
        foreach(array_keys($ourdb) as $db) {
                if ($ourdb[$db]['havedriver']) {
@@ -2231,8 +2230,7 @@ function database_picker($conf) {
        print "\n\t";
 }
 
-function database_switcher($db) {
-       global $ourdb;
+function database_switcher($ourdb, $db) {
        $color = $ourdb[$db]['bgcolor'];
        $full = $ourdb[$db]['fullname'];
        print "<fieldset id='$db' style='clear:both'><legend>$full-specific options</legend>\n";