From: Platonides <platonides@users.mediawiki.org>
Date: Thu, 12 Aug 2010 14:50:09 +0000 (+0000)
Subject: Follow up r69543, r70608
X-Git-Tag: 1.31.0-rc.0~35523
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/voir.php?a=commitdiff_plain;h=5a8d16a188a4eaf65a35cf985e6b42c7fb4ee6d1;p=lhc%2Fweb%2Fwiklou.git

Follow up r69543, r70608
Remove unused	$wgSuperUser and superflous non-global $wgDBsuperuser.
---

diff --git a/config/Installer.php b/config/Installer.php
index 7ebc8bdd97..e2a29d1361 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -921,11 +921,9 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		}
 		else if ( $conf->DBtype == 'mssql' ) {
 			error_reporting( E_ALL );
-			$wgSuperUser = '';
-			# # Possible connect as a superuser
+			# Possible connect as a superuser
 			if ( $useRoot ) {
-				$wgDBsuperuser = $conf->RootUser;
-				echo( "<li>Attempting to connect to database \"{$conf->DBtype}\" as superuser \"{$wgDBsuperuser}\"" );
+				echo( "<li>Attempting to connect to database \"{$conf->DBtype}\" as superuser \"{$conf->RootUser}\"" );
 				$wgDatabase = $dbc->newFromParams(
 										$conf->DBserver,
 										$conf->RootUser,
@@ -1080,7 +1078,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			}
 		} else { # not mysql
 			error_reporting( E_ALL | E_STRICT );
-			$wgSuperUser = '';
 			## Possible connect as a superuser
 			// Changed !mysql to postgres check since it seems to only apply to postgres
 			if( $useRoot && $conf->DBtype == 'postgres' ) {