From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 1 Feb 2013 02:26:24 +0000 (-0800)
Subject: [LockManager] Updated DBLockManager for cross-wiki support.
X-Git-Tag: 1.31.0-rc.0~20832^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=2693fa5d1b41ac0d2a9f27fbd2164e11dd064e1a;p=lhc%2Fweb%2Fwiklou.git

[LockManager] Updated DBLockManager for cross-wiki support.

Change-Id: If02274a3173463ce66037221f494a1ee68ffa51d
---

diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index 196a32ac71..8196d5b8f4 100644
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -197,8 +197,8 @@ class DBLockManager extends QuorumLockManager {
 		if ( !isset( $this->conns[$lockDb] ) ) {
 			$db = null;
 			if ( $lockDb === 'localDBMaster' ) {
-				$lb = wfGetLBFactory()->newMainLB();
-				$db = $lb->getConnection( DB_MASTER );
+				$lb = wfGetLBFactory()->getMainLB( $this->wiki );
+				$db = $lb->getConnection( DB_MASTER, array(), $this->wiki );
 			} elseif ( isset( $this->dbServers[$lockDb] ) ) {
 				$config = $this->dbServers[$lockDb];
 				$db = DatabaseBase::factory( $config['type'], $config );