From 2693fa5d1b41ac0d2a9f27fbd2164e11dd064e1a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 31 Jan 2013 18:26:24 -0800 Subject: [PATCH] [LockManager] Updated DBLockManager for cross-wiki support. Change-Id: If02274a3173463ce66037221f494a1ee68ffa51d --- includes/filebackend/lockmanager/DBLockManager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ); -- 2.20.1