| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -604,7 +604,7 @@ |
| 605 | 605 | * |
| 606 | 606 | * @param $dbType String A possible DB type |
| 607 | 607 | * @param $p Array An array of options to pass to the constructor. |
| 608 | | - * Valid options are: host, user, password, dbName, flags, tablePrefix |
| | 608 | + * Valid options are: host, user, password, dbname, flags, tablePrefix |
| 609 | 609 | * @return DatabaseBase subclass or null |
| 610 | 610 | */ |
| 611 | 611 | public final static function factory( $dbType, $p = array() ) { |
| — | — | @@ -619,7 +619,7 @@ |
| 620 | 620 | isset( $p['host'] ) ? $p['host'] : false, |
| 621 | 621 | isset( $p['user'] ) ? $p['user'] : false, |
| 622 | 622 | isset( $p['password'] ) ? $p['password'] : false, |
| 623 | | - isset( $p['dbName'] ) ? $p['dbName'] : false, |
| | 623 | + isset( $p['dbname'] ) ? $p['dbname'] : false, |
| 624 | 624 | isset( $p['flags'] ) ? $p['flags'] : 0, |
| 625 | 625 | isset( $p['tablePrefix'] ) ? $p['tablePrefix'] : 'get from global' |
| 626 | 626 | ); |
| Index: trunk/phase3/includes/filerepo/ForeignDBRepo.php |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | 'host' => $this->dbServer, |
| 42 | 42 | 'user' => $this->dbUser, |
| 43 | 43 | 'password' => $this->dbPassword, |
| 44 | | - 'dbName' => $this->dbName, |
| | 44 | + 'dbname' => $this->dbName, |
| 45 | 45 | 'flags' => $this->dbFlags, |
| 46 | 46 | 'tablePrefix' => $this->tablePrefix |
| 47 | 47 | ) |
| Index: trunk/phase3/includes/extauth/MediaWiki.php |
| — | — | @@ -94,7 +94,7 @@ |
| 95 | 95 | 'host' => $wgExternalAuthConf['DBserver'], |
| 96 | 96 | 'user' => $wgExternalAuthConf['DBuser'], |
| 97 | 97 | 'password' => $wgExternalAuthConf['DBpassword'], |
| 98 | | - 'dbName' => $wgExternalAuthConf['DBname'], |
| | 98 | + 'dbname' => $wgExternalAuthConf['DBname'], |
| 99 | 99 | 'tablePrefix' => $wgExternalAuthConf['DBprefix'], |
| 100 | 100 | ) |
| 101 | 101 | ); |
| Index: trunk/phase3/includes/extauth/vB.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | * 'server' => 'localhost', |
| 35 | 35 | * 'username' => 'forum', |
| 36 | 36 | * 'password' => 'udE,jSqDJ<""p=fI.K9', |
| 37 | | - * 'dbName' => 'forum', |
| | 37 | + * 'dbname' => 'forum', |
| 38 | 38 | * 'tablePrefix' => '', |
| 39 | 39 | * 'cookieprefix' => 'bb' |
| 40 | 40 | * ); |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | $wgExternalAuthConf['server'], |
| 109 | 109 | $wgExternalAuthConf['username'], |
| 110 | 110 | $wgExternalAuthConf['password'], |
| 111 | | - $wgExternalAuthConf['dbName'], |
| | 111 | + $wgExternalAuthConf['dbname'], |
| 112 | 112 | 0, |
| 113 | 113 | $wgExternalAuthConf['tablePrefix'] |
| 114 | 114 | ); |