diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /includes/dao/DBAccessBase.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'includes/dao/DBAccessBase.php')
| -rw-r--r-- | includes/dao/DBAccessBase.php | 8 |
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 ) { |