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

diff --cc includes/specials/pagers/ActiveUsersPager.php
Simple merge

diff --cc includes/specials/pagers/AllMessagesTablePager.php
Simple merge

diff --cc includes/specials/pagers/ContribsPager.php
index 59f26a2,780f483..ca13f3d
--- 1/includes/specials/pagers/ContribsPager.php
--- 2/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 = [];

diff --cc includes/specials/pagers/ImageListPager.php
Simple merge

diff --cc includes/specials/pagers/NewPagesPager.php
Simple merge

diff --cc includes/specials/pagers/UsersPager.php
Simple merge