From: Peter Gehres <pgehres@wikimedia.org>
Date: Wed, 20 Mar 2013 21:21:16 +0000 (-0700)
Subject: Fix wfWaitForSlaves() so the $wiki parameter actually works correctly
X-Git-Tag: 1.31.0-rc.0~20267^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=7cb764095f2f9187fb858a3fb0940d57aeb72cbd;p=lhc%2Fweb%2Fwiklou.git

Fix wfWaitForSlaves() so the $wiki parameter actually works correctly

Change-Id: I1f3da5921f2d724e10c448700ea8b958ff159451
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 99f5eb5a8f..017ab7d91b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3655,7 +3655,7 @@ function wfWaitForSlaves( $maxLag = false, $wiki = false ) {
 	// bug 27975 - Don't try to wait for slaves if there are none
 	// Prevents permission error when getting master position
 	if ( $lb->getServerCount() > 1 ) {
-		$dbw = $lb->getConnection( DB_MASTER );
+		$dbw = $lb->getConnection( DB_MASTER, array(), $wiki );
 		$pos = $dbw->getMasterPos();
 		$lb->waitForAll( $pos );
 	}