From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 21 Dec 2018 23:39:16 +0000 (+0000)
Subject: Merge "Mark protected IndexPager properties also as protected in subclasses"
X-Git-Tag: 1.34.0-rc.0~3193
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=2b5cd3242845e7c61fd0310e17d2e67d82a1cb7e;p=lhc%2Fweb%2Fwiklou.git

Merge "Mark protected IndexPager properties also as protected in subclasses"
---

2b5cd3242845e7c61fd0310e17d2e67d82a1cb7e
diff --cc includes/specials/pagers/ContribsPager.php
index 59f26a213a,780f483aaf..ca13f3de85
--- a/includes/specials/pagers/ContribsPager.php
+++ b/includes/specials/pagers/ContribsPager.php
@@@ -414,22 -350,20 +414,22 @@@ class ContribsPager extends RangeChrono
  	}
  
  	/**
 -	 * Override of getIndexField() in IndexPager.
 -	 * For IP ranges, it's faster to use the replicated ipc_rev_timestamp
 -	 * on the `ip_changes` table than the rev_timestamp on the `revision` table.
 -	 * @return string Name of field
 +	 * @return string
  	 */
  	public function getIndexField() {
 -		if ( $this->isQueryableRange( $this->target ) ) {
 -			return 'ipc_rev_timestamp';
 -		} else {
 -			return 'rev_timestamp';
 -		}
 +		// Note this is run via parent::__construct() *before* $this->target is set!
 +		return 'rev_timestamp';
 +	}
 +
 +	/**
 +	 * @return string[]
 +	 */
 +	protected function getExtraSortFields() {
 +		// Note this is run via parent::__construct() *before* $this->target is set!
 +		return [ 'rev_id' ];
  	}
  
- 	function doBatchLookups() {
+ 	protected function doBatchLookups() {
  		# Do a link batch query
  		$this->mResult->seek( 0 );
  		$parentRevIds = [];