summaryrefslogtreecommitdiff
path: root/includes/dao/DBAccessBase.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-12-27 15:41:37 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-12-31 11:43:28 +0100
commitc1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch)
tree2b38796e738dd74cb42ecd9bfd151803108386bc /includes/dao/DBAccessBase.php
parentb88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff)
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/dao/DBAccessBase.php')
-rw-r--r--includes/dao/DBAccessBase.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index 6c009dee..3909faa7 100644
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -2,7 +2,7 @@
/**
* Base class for objects that allow access to other wiki's databases using
- * the foreign database access mechanism implemented by LBFactory_multi.
+ * the foreign database access mechanism implemented by LBFactoryMulti.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -28,9 +28,8 @@
* @author Daniel Kinzler
*/
abstract class DBAccessBase implements IDBAccessObject {
-
/**
- * @var String|bool $wiki The target wiki's name. This must be an ID
+ * @var string|bool $wiki The target wiki's name. This must be an ID
* that LBFactory can understand.
*/
protected $wiki = false;
@@ -58,6 +57,7 @@ abstract class DBAccessBase implements IDBAccessObject {
*/
protected function getConnection( $id, $groups = array() ) {
$loadBalancer = wfGetLB( $this->wiki );
+
return $loadBalancer->getConnection( $id, $groups, $this->wiki );
}
@@ -68,7 +68,7 @@ abstract class DBAccessBase implements IDBAccessObject {
*
* @since 1.21
*
- * @param DatabaseBase $db the database connection to release.
+ * @param DatabaseBase $db The database connection to release.
*/
protected function releaseConnection( DatabaseBase $db ) {
if ( $this->wiki !== false ) {