Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313333
Change subject: Use DatabaseBase::factory() over Database::factory()
......................................................................
Use DatabaseBase::factory() over Database::factory()
Change-Id: Id34ae083d871bd3bfb70e1c220aca175ac399129
---
M CargoUtils.php
1 file changed, 15 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/33/313333/1
diff --git a/CargoUtils.php b/CargoUtils.php
index 78e4979..da98f1a 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -17,7 +17,7 @@
* @global string $wgCargoDBuser
* @global string $wgCargoDBpassword
* @global string $wgCargoDBtype
- * @return DatabaseBase
+ * @return Database
*/
public static function getDB() {
global $wgDBuser, $wgDBpassword, $wgDBprefix;
@@ -35,16 +35,20 @@
$dbFlags = DBO_DEFAULT;
$dbTablePrefix = $wgDBprefix . 'cargo__';
- $db = DatabaseBase::factory( $dbType,
- array(
- 'host' => $dbServer,
- 'user' => $dbUsername,
- 'password' => $dbPassword,
- 'dbname' => $dbName,
- 'flags' => $dbFlags,
- 'tablePrefix' => $dbTablePrefix,
- )
- );
+ $params = [
+ 'host' => $dbServer,
+ 'user' => $dbUsername,
+ 'password' => $dbPassword,
+ 'dbname' => $dbName,
+ 'flags' => $dbFlags,
+ 'tablePrefix' => $dbTablePrefix,
+ ];
+ if ( method_exists( 'Database', 'factory' ) ) {
+ $db = Database::factory( $dbType, $params );
+ } else {
+ $db = DatabaseBase::factory( $dbType, $params );
+ }
+
return $db;
}
--
To view, visit https://gerrit.wikimedia.org/r/313333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id34ae083d871bd3bfb70e1c220aca175ac399129
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
