Try to address some of the issues of r70608.

[lhc/web/wiklou.git] / config / Installer.php

diff --git a/config/Installer.php b/config/Installer.php
index 36b87eb..c90ba44 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -920,7 +920,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        if( !$ok ) { continue; }
                }
                else if ( $conf->DBtype == 'mssql' ) {
-                       error_reporting( E_ALL );
                        # Possible connect as a superuser
                        if ( $useRoot ) {
                                echo( "<li>Attempting to connect to database \"{$conf->DBtype}\" as superuser \"{$conf->RootUser}\"" );
@@ -939,7 +938,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                                        $errs['RootPW'] = 'and password';
                                        continue;
                                }
-                               $wgDatabase->initial_setup( $conf->RootPW, $conf->DBtype );
+                               $wgDatabase->initial_setup( $conf->DBname, $conf->DBuser, $conf->DBpassword );
                        }
                        echo( "<li>Attempting to connect to database \"{$wgDBname}\" as \"{$wgDBuser}\"..." );
                        $wgDatabase = $dbc->newFromParams(