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

Change-Id: I1f3da5921f2d724e10c448700ea8b958ff159451

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 99f5eb5..017ab7d 100644 (file)
--- 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 );
        }