From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 20 Jun 2011 07:40:07 +0000 (+0000)
Subject: Revert the dbname -> dbName part of r90430. dbname actually dates back to r32578... 
X-Git-Tag: 1.31.0-rc.0~29403
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=c1f96d15309155638a7dbef54b2434706359118f;p=lhc%2Fweb%2Fwiklou.git

Revert the dbname -> dbName part of r90430. dbname actually dates back to r32578 and is referenced in the documentation for $wgDBservers, so it can't be easily changed. We can still kill tablename though, it's not too late.
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 78d31a43bd..eec3ddfba9 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -604,7 +604,7 @@ abstract class DatabaseBase implements DatabaseType {
 	 *
 	 * @param $dbType String A possible DB type
 	 * @param $p Array An array of options to pass to the constructor.
-	 *    Valid options are: host, user, password, dbName, flags, tablePrefix
+	 *    Valid options are: host, user, password, dbname, flags, tablePrefix
 	 * @return DatabaseBase subclass or null
 	 */
 	public final static function factory( $dbType, $p = array() ) {
@@ -619,7 +619,7 @@ abstract class DatabaseBase implements DatabaseType {
 				isset( $p['host'] ) ? $p['host'] : false,
 				isset( $p['user'] ) ? $p['user'] : false,
 				isset( $p['password'] ) ? $p['password'] : false,
-				isset( $p['dbName'] ) ? $p['dbName'] : false,
+				isset( $p['dbname'] ) ? $p['dbname'] : false,
 				isset( $p['flags'] ) ? $p['flags'] : 0,
 				isset( $p['tablePrefix'] ) ? $p['tablePrefix'] : 'get from global'
 			);
diff --git a/includes/extauth/MediaWiki.php b/includes/extauth/MediaWiki.php
index 062d5903e7..0a5efae6ee 100644
--- a/includes/extauth/MediaWiki.php
+++ b/includes/extauth/MediaWiki.php
@@ -94,7 +94,7 @@ class ExternalUser_MediaWiki extends ExternalUser {
 				'host'        => $wgExternalAuthConf['DBserver'],
 				'user'        => $wgExternalAuthConf['DBuser'],
 				'password'    => $wgExternalAuthConf['DBpassword'],
-				'dbName'      => $wgExternalAuthConf['DBname'],
+				'dbname'      => $wgExternalAuthConf['DBname'],
 				'tablePrefix' => $wgExternalAuthConf['DBprefix'],
 			)
 		);
diff --git a/includes/extauth/vB.php b/includes/extauth/vB.php
index ff0dcb58e4..f516c4234f 100644
--- a/includes/extauth/vB.php
+++ b/includes/extauth/vB.php
@@ -33,7 +33,7 @@
  *       'server' => 'localhost',
  *       'username' => 'forum',
  *       'password' => 'udE,jSqDJ<""p=fI.K9',
- *       'dbName' => 'forum',
+ *       'dbname' => 'forum',
  *       'tablePrefix' => '',
  *       'cookieprefix' => 'bb'
  *   );
@@ -107,7 +107,7 @@ class ExternalUser_vB extends ExternalUser {
 			$wgExternalAuthConf['server'],
 			$wgExternalAuthConf['username'],
 			$wgExternalAuthConf['password'],
-			$wgExternalAuthConf['dbName'],
+			$wgExternalAuthConf['dbname'],
 			0,
 			$wgExternalAuthConf['tablePrefix']
 		);
diff --git a/includes/filerepo/ForeignDBRepo.php b/includes/filerepo/ForeignDBRepo.php
index 879113724a..0311ebcd7d 100644
--- a/includes/filerepo/ForeignDBRepo.php
+++ b/includes/filerepo/ForeignDBRepo.php
@@ -40,7 +40,7 @@ class ForeignDBRepo extends LocalRepo {
 					'host' => $this->dbServer,
 					'user'   => $this->dbUser,
 					'password' => $this->dbPassword,
-					'dbName' => $this->dbName,
+					'dbname' => $this->dbName,
 					'flags' => $this->dbFlags,
 					'tablePrefix' => $this->tablePrefix
 				)