From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 14 Jan 2014 22:57:44 +0000 (+0000)
Subject: Revert "SpecialContributions: Avoid using 'contributions' slave for getParentLengths"
X-Git-Tag: 1.31.0-rc.0~17249
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=b95e125b2d17375105f35192f7aeb5b77b4bf337;p=lhc%2Fweb%2Fwiklou.git

Revert "SpecialContributions: Avoid using 'contributions' slave for getParentLengths"

Actually this won't work, as the LB will see an already open slave and just reuse the same connection.

This reverts commit fdf4b7cbd934f7f8d76de4564c4d4f83d60d8e4d.

Change-Id: I790f5b303fa264ecc36793b8650c79daae367e70
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 0a24661b3f..6b56c2fa2a 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -856,8 +856,7 @@ class ContribsPager extends ReverseChronologicalPager {
 				$batch->add( $row->page_namespace, $row->page_title );
 			}
 		}
-		# Bug 59987: avoid using 'contributions' db connection
-		$this->mParentLens = Revision::getParentLengths( wfGetDB( DB_SLAVE ), $revIds );
+		$this->mParentLens = Revision::getParentLengths( $this->getDatabase(), $revIds );
 		$batch->execute();
 		$this->mResult->seek( 0 );
 	}