From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Wed, 28 Jun 2006 17:56:27 +0000 (+0000)
Subject: Make DBport global, restrict user creation and grants to mysql for now.
X-Git-Tag: 1.31.0-rc.0~56554
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=c45ce9b1733ac43a688873dd723b42c821766754;p=lhc%2Fweb%2Fwiklou.git

Make DBport global, restrict user creation and grants to mysql for now.
---

diff --git a/config/index.php b/config/index.php
index 6868b6dcf2..528543e3e6 100644
--- a/config/index.php
+++ b/config/index.php
@@ -582,6 +582,7 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 		$wgDBadminuser = "root";
 		$wgDBadminpassword = $conf->RootPW;
 		$wgDBprefix = $conf->DBprefix;
+		$wgDBport = $conf->DBport;
 		$wgCommandLineMode = true;
 		$wgUseDatabaseMessages = false;	/* FIXME: For database failure */
 		require_once( "includes/Setup.php" );
@@ -725,8 +726,8 @@ error_reporting( E_ALL );
 		if( $wgDatabase->tableExists( "cur" ) || $wgDatabase->tableExists( "revision" ) ) {
 			print "<li>There are already MediaWiki tables in this database. Checking if updates are needed...</li>\n";
 
-			# Create user if required
-			if ( $conf->Root ) {
+			# Create user if required (todo: other databases)
+			if ( $conf->Root && $conf->DBtype == 'mysql') {
 				$conn = $dbc->newFromParams( $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, 1 );
 				if ( $conn->isOpen() ) {
 					print "<li>DB user account ok</li>\n";